forked from boostorg/container
Merge branch 'develop' of https://github.com/eldiener/container into eldiener-develop
This commit is contained in:
commit
f9340421da
2 files changed
+29
-1
No files matched your search
@@ -52,6 +52,8 @@ class BOOST_CONTAINER_DECL memory_resource
|
||||
//! `return return do_is_equal(other);`
|
||||
bool is_equal(const memory_resource& other) const BOOST_NOEXCEPT
|
||||
{ return this->do_is_equal(other); }
|
||||
|
||||
#if !defined(BOOST_EMBTC)
|
||||
|
||||
//! <b>Returns</b>:
|
||||
//! `&a == &b || a.is_equal(b)`.
|
||||
@@ -62,6 +64,18 @@ class BOOST_CONTAINER_DECL memory_resource
|
||||
//! !(a == b).
|
||||
friend bool operator!=(const memory_resource& a, const memory_resource& b) BOOST_NOEXCEPT
|
||||
{ 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:
|
||||
//! <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;
|
||||
};
|
||||
|
||||
#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 container {
|
||||
} //namespace boost {
|
||||
|
||||
Reference in new issue
Block a user