luo980/uvw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

now working with libuv v1.15.0

Browse Source
This commit is contained in:
Michele Caini 2017-10-05 13:55:05 +02:00
parent 356c57b8e5
commit efd66f07dd
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -16,7 +16,7 @@ endif()
# Project configuration
#
project(uvw VERSION 1.2.0)
project(uvw VERSION 1.3.0)
if(NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE Debug)

4
cmake/in/libuv.in
View File

@ -7,7 +7,7 @@ if(WIN32)
ExternalProject_Add(
libuv
GIT_REPOSITORY https://github.com/libuv/libuv.git
GIT_TAG v1.14.1
GIT_TAG v1.15.0
DOWNLOAD_DIR ${LIBUV_DEPS_DIR}
TMP_DIR ${LIBUV_DEPS_DIR}/tmp
STAMP_DIR ${LIBUV_DEPS_DIR}/stamp
@ -22,7 +22,7 @@ else(WIN32)
ExternalProject_Add(
libuv
GIT_REPOSITORY https://github.com/libuv/libuv.git
GIT_TAG v1.14.1
GIT_TAG v1.15.0
DOWNLOAD_DIR ${LIBUV_DEPS_DIR}
TMP_DIR ${LIBUV_DEPS_DIR}/tmp
STAMP_DIR ${LIBUV_DEPS_DIR}/stamp

8
src/uvw/thread.hpp
View File

@ -113,10 +113,14 @@ class Mutex final: public UnderlyingType<Mutex, uv_mutex_t> {
friend class Condition;
public:
explicit Mutex(ConstructorAccess ca, std::shared_ptr<Loop> ref) noexcept
explicit Mutex(ConstructorAccess ca, std::shared_ptr<Loop> ref, bool recursive = false) noexcept
: UnderlyingType{ca, std::move(ref)}
{
uv_mutex_init(get());
if(recursive) {
uv_mutex_init_recursive(get());
} else {
uv_mutex_init(get());
}
}
~Mutex() noexcept {