diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2017-01-06 20:13:54 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2017-01-06 20:13:54 +0000 |
| commit | 4a2db4d30e1653093d4d8b06e8221e2f8b723507 (patch) | |
| tree | 941a9d805eb2afbba58f445381819ba0e1dc355f /src | |
| parent | cb08bb04c85c6dcd3d951725505317c31eeff323 (diff) | |
Notes
Diffstat (limited to 'src')
| -rw-r--r-- | src/experimental/memory_resource.cpp | 6 | ||||
| -rw-r--r-- | src/include/config_elast.h | 2 | ||||
| -rw-r--r-- | src/memory.cpp | 5 | ||||
| -rw-r--r-- | src/mutex.cpp | 8 |
4 files changed, 11 insertions, 10 deletions
diff --git a/src/experimental/memory_resource.cpp b/src/experimental/memory_resource.cpp index 3e87a2dedded..cc6aab38e058 100644 --- a/src/experimental/memory_resource.cpp +++ b/src/experimental/memory_resource.cpp @@ -23,7 +23,7 @@ _LIBCPP_BEGIN_NAMESPACE_LFTS_PMR // new_delete_resource() -class _LIBCPP_TYPE_VIS_ONLY __new_delete_memory_resource_imp +class _LIBCPP_TYPE_VIS __new_delete_memory_resource_imp : public memory_resource { public: @@ -42,7 +42,7 @@ protected: // null_memory_resource() -class _LIBCPP_TYPE_VIS_ONLY __null_memory_resource_imp +class _LIBCPP_TYPE_VIS __null_memory_resource_imp : public memory_resource { public: @@ -140,4 +140,4 @@ memory_resource * set_default_resource(memory_resource * __new_res) _NOEXCEPT return __default_memory_resource(true, __new_res); } -_LIBCPP_END_NAMESPACE_LFTS_PMR
\ No newline at end of file +_LIBCPP_END_NAMESPACE_LFTS_PMR diff --git a/src/include/config_elast.h b/src/include/config_elast.h index dd736d1a5e3a..97104290d883 100644 --- a/src/include/config_elast.h +++ b/src/include/config_elast.h @@ -30,7 +30,7 @@ // No _LIBCPP_ELAST needed on Apple #elif defined(__sun__) #define _LIBCPP_ELAST ESTALE -#elif defined(_LIBCPP_MSCVRT) +#elif defined(_LIBCPP_MSVCRT) #define _LIBCPP_ELAST _sys_nerr #else // Warn here so that the person doing the libcxx port has an easier time: diff --git a/src/memory.cpp b/src/memory.cpp index 514a2ce22667..8569fafb337c 100644 --- a/src/memory.cpp +++ b/src/memory.cpp @@ -220,11 +220,12 @@ undeclare_no_pointers(char*, size_t) { } -pointer_safety -get_pointer_safety() _NOEXCEPT +#if !defined(_LIBCPP_ABI_POINTER_SAFETY_ENUM_TYPE) +pointer_safety get_pointer_safety() _NOEXCEPT { return pointer_safety::relaxed; } +#endif void* __undeclare_reachable(void* p) diff --git a/src/mutex.cpp b/src/mutex.cpp index dc530ceeac0d..9397ae73ca4f 100644 --- a/src/mutex.cpp +++ b/src/mutex.cpp @@ -59,7 +59,7 @@ recursive_mutex::recursive_mutex() recursive_mutex::~recursive_mutex() { - int e = __libcpp_mutex_destroy(&__m_); + int e = __libcpp_recursive_mutex_destroy(&__m_); (void)e; assert(e == 0); } @@ -67,7 +67,7 @@ recursive_mutex::~recursive_mutex() void recursive_mutex::lock() { - int ec = __libcpp_mutex_lock(&__m_); + int ec = __libcpp_recursive_mutex_lock(&__m_); if (ec) __throw_system_error(ec, "recursive_mutex lock failed"); } @@ -75,7 +75,7 @@ recursive_mutex::lock() void recursive_mutex::unlock() _NOEXCEPT { - int e = __libcpp_mutex_unlock(&__m_); + int e = __libcpp_recursive_mutex_unlock(&__m_); (void)e; assert(e == 0); } @@ -83,7 +83,7 @@ recursive_mutex::unlock() _NOEXCEPT bool recursive_mutex::try_lock() _NOEXCEPT { - return __libcpp_mutex_trylock(&__m_) == 0; + return __libcpp_recursive_mutex_trylock(&__m_) == 0; } // timed_mutex |