feedc0de/boost_container
1
0
Fork 0
forked from boostorg/container
Code Pull Requests Activity

Merge branch 'develop' of https://github.com/eldiener/container into eldiener-develop

Browse Source
This commit is contained in:
Ion Gaztañaga
2020-05-25 00:36:06 +02:00
parent 52b9ae0e68 cc5c59c7a5
commit f9340421da
2 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
include/boost/container/pmr/memory_resource.hpp
View File

@@ -53,6 +53,8 @@ class BOOST_CONTAINER_DECL memory_resource
bool is_equal(const memory_resource& other) const BOOST_NOEXCEPT bool is_equal(const memory_resource& other) const BOOST_NOEXCEPT
{ return this->do_is_equal(other); } { return this->do_is_equal(other); }
#if !defined(BOOST_EMBTC)
//! <b>Returns</b>: //! <b>Returns</b>:
//! `&a == &b || a.is_equal(b)`. //! `&a == &b || a.is_equal(b)`.
friend bool operator==(const memory_resource& a, const memory_resource& b) BOOST_NOEXCEPT friend bool operator==(const memory_resource& a, const memory_resource& b) BOOST_NOEXCEPT
@@ -63,6 +65,18 @@ class BOOST_CONTAINER_DECL memory_resource
friend bool operator!=(const memory_resource& a, const memory_resource& b) BOOST_NOEXCEPT friend bool operator!=(const memory_resource& a, const memory_resource& b) BOOST_NOEXCEPT
{ return !(a == b); } { return !(a == b); }
#else
//! <b>Returns</b>:
//! `&a == &b || a.is_equal(b)`.
friend bool operator==(const memory_resource& a, const memory_resource& b) BOOST_NOEXCEPT;
//! <b>Returns</b>:
//! !(a == b).
friend bool operator!=(const memory_resource& a, const memory_resource& b) BOOST_NOEXCEPT;
#endif
protected: protected:
//! <b>Requires</b>: Alignment shall be a power of two. //! <b>Requires</b>: Alignment shall be a power of two.
//! //!
@@ -93,6 +107,20 @@ class BOOST_CONTAINER_DECL memory_resource
virtual bool do_is_equal(const memory_resource& other) const BOOST_NOEXCEPT = 0; virtual bool do_is_equal(const memory_resource& other) const BOOST_NOEXCEPT = 0;
}; };
#if defined(BOOST_EMBTC)
//! <b>Returns</b>:
//! `&a == &b || a.is_equal(b)`.
inline bool operator==(const memory_resource& a, const memory_resource& b) BOOST_NOEXCEPT
{ return &a == &b || a.is_equal(b); }
//! <b>Returns</b>:
//! !(a == b).
inline bool operator!=(const memory_resource& a, const memory_resource& b) BOOST_NOEXCEPT
{ return !(a == b); }
#endif
} //namespace pmr { } //namespace pmr {
} //namespace container { } //namespace container {
} //namespace boost { } //namespace boost {

2
src/dlmalloc_2_8_6.c
View File

@@ -1515,7 +1515,7 @@ LONG __cdecl _InterlockedExchange(LONG volatile *Target, LONG Value);
#pragma intrinsic (_InterlockedExchange) #pragma intrinsic (_InterlockedExchange)
#define interlockedcompareexchange _InterlockedCompareExchange #define interlockedcompareexchange _InterlockedCompareExchange
#define interlockedexchange _InterlockedExchange #define interlockedexchange _InterlockedExchange
#elif defined(WIN32) && defined(__GNUC__) #elif defined(WIN32) && (defined(__GNUC__) || defined(__clang__))
#define interlockedcompareexchange(a, b, c) __sync_val_compare_and_swap(a, c, b) #define interlockedcompareexchange(a, b, c) __sync_val_compare_and_swap(a, c, b)
#define interlockedexchange __sync_lock_test_and_set #define interlockedexchange __sync_lock_test_and_set
#endif /* Win32 */ #endif /* Win32 */