feedc0de/boost_unordered
1
0
Fork 0
forked from boostorg/unordered
Code Pull Requests Activity

Fix Visual C++ 9.0 workaround.

Browse Source
This commit is contained in:
Daniel James
2014-12-03 18:28:40 +00:00
parent 9090d87725
commit 0273ec59d7
1 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
test/objects/minimal.hpp
View File

@ -20,9 +20,9 @@
#endif #endif
#if !BOOST_WORKAROUND(BOOST_MSVC, == 1500) #if !BOOST_WORKAROUND(BOOST_MSVC, == 1500)
#define BOOST_UNORDERED_PRIVATE_AMPERSAND private #define BOOST_UNORDERED_CHECK_ADDR_OPERATOR_NOT_USED 1
#else #else
#define BOOST_UNORDERED_PRIVATE_AMPERSAND public #define BOOST_UNORDERED_CHECK_ADDR_OPERATOR_NOT_USED 0
#endif #endif
namespace test namespace test
@ -93,9 +93,10 @@ namespace minimal
copy_constructible_equality_comparable& operator=( copy_constructible_equality_comparable& operator=(
copy_constructible_equality_comparable const&); copy_constructible_equality_comparable const&);
copy_constructible_equality_comparable() {} copy_constructible_equality_comparable() {}
BOOST_UNORDERED_PRIVATE_AMPERSAND: #if BOOST_UNORDERED_CHECK_ADDR_OPERATOR_NOT_USED
ampersand_operator_used operator&() const { ampersand_operator_used operator&() const {
return ampersand_operator_used(); } return ampersand_operator_used(); }
#endif
}; };
bool operator==( bool operator==(
@ -136,9 +137,10 @@ namespace minimal
void dummy_member() const {} void dummy_member() const {}
BOOST_UNORDERED_PRIVATE_AMPERSAND: #if BOOST_UNORDERED_CHECK_ADDR_OPERATOR_NOT_USED
ampersand_operator_used operator&() const { ampersand_operator_used operator&() const {
return ampersand_operator_used(); } return ampersand_operator_used(); }
#endif
}; };
class assignable class assignable
@ -151,9 +153,10 @@ namespace minimal
void dummy_member() const {} void dummy_member() const {}
private: private:
assignable() {} assignable() {}
BOOST_UNORDERED_PRIVATE_AMPERSAND: #if BOOST_UNORDERED_CHECK_ADDR_OPERATOR_NOT_USED
ampersand_operator_used operator&() const { ampersand_operator_used operator&() const {
return ampersand_operator_used(); } return ampersand_operator_used(); }
#endif
}; };
struct movable_init {}; struct movable_init {};
@ -202,9 +205,10 @@ namespace minimal
~hash() {} ~hash() {}
std::size_t operator()(T const&) const { return 0; } std::size_t operator()(T const&) const { return 0; }
BOOST_UNORDERED_PRIVATE_AMPERSAND: #if BOOST_UNORDERED_CHECK_ADDR_OPERATOR_NOT_USED
ampersand_operator_used operator&() const { ampersand_operator_used operator&() const {
return ampersand_operator_used(); } return ampersand_operator_used(); }
#endif
}; };
template <class T> template <class T>
@ -218,9 +222,10 @@ namespace minimal
~equal_to() {} ~equal_to() {}
bool operator()(T const&, T const&) const { return true; } bool operator()(T const&, T const&) const { return true; }
BOOST_UNORDERED_PRIVATE_AMPERSAND: #if BOOST_UNORDERED_CHECK_ADDR_OPERATOR_NOT_USED
ampersand_operator_used operator&() const { ampersand_operator_used operator&() const {
return ampersand_operator_used(); } return ampersand_operator_used(); }
#endif
}; };
template <class T> class ptr; template <class T> class ptr;
@ -308,9 +313,10 @@ namespace minimal
bool operator>(ptr const& x) const { return ptr_ > x.ptr_; } bool operator>(ptr const& x) const { return ptr_ > x.ptr_; }
bool operator<=(ptr const& x) const { return ptr_ <= x.ptr_; } bool operator<=(ptr const& x) const { return ptr_ <= x.ptr_; }
bool operator>=(ptr const& x) const { return ptr_ >= x.ptr_; } bool operator>=(ptr const& x) const { return ptr_ >= x.ptr_; }
BOOST_UNORDERED_PRIVATE_AMPERSAND: #if BOOST_UNORDERED_CHECK_ADDR_OPERATOR_NOT_USED
ampersand_operator_used operator&() const { ampersand_operator_used operator&() const {
return ampersand_operator_used(); } return ampersand_operator_used(); }
#endif
}; };
template <class T> template <class T>
@ -345,9 +351,10 @@ namespace minimal
bool operator>(const_ptr const& x) const { return ptr_ > x.ptr_; } bool operator>(const_ptr const& x) const { return ptr_ > x.ptr_; }
bool operator<=(const_ptr const& x) const { return ptr_ <= x.ptr_; } bool operator<=(const_ptr const& x) const { return ptr_ <= x.ptr_; }
bool operator>=(const_ptr const& x) const { return ptr_ >= x.ptr_; } bool operator>=(const_ptr const& x) const { return ptr_ >= x.ptr_; }
BOOST_UNORDERED_PRIVATE_AMPERSAND: #if BOOST_UNORDERED_CHECK_ADDR_OPERATOR_NOT_USED
ampersand_operator_used operator&() const { ampersand_operator_used operator&() const {
return ampersand_operator_used(); } return ampersand_operator_used(); }
#endif
}; };
template <class T> template <class T>
@ -407,9 +414,10 @@ namespace minimal
#else #else
private: allocator& operator=(allocator const&); private: allocator& operator=(allocator const&);
#endif #endif
BOOST_UNORDERED_PRIVATE_AMPERSAND: #if BOOST_UNORDERED_CHECK_ADDR_OPERATOR_NOT_USED
ampersand_operator_used operator&() const { ampersand_operator_used operator&() const {
return ampersand_operator_used(); } return ampersand_operator_used(); }
#endif
}; };
template <class T> template <class T>