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

Fix potential msvc 12 workaround.

Browse Source 
[SVN r86433]
This commit is contained in:
Daniel James
2013-10-25 22:21:51 +00:00
parent b4d62e4670
commit 621c1523c0
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/boost/unordered/unordered_map.hpp
View File

@ -409,9 +409,9 @@ namespace unordered
void insert(std::initializer_list<value_type>); void insert(std::initializer_list<value_type>);
#if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1800)) #if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1800))
template <typename T> template <typename T1>
typename boost::enable_if_c< typename boost::enable_if_c<
boost::is_convertible<T, value_type>::value, boost::is_convertible<T1, value_type>::value,
void>::type insert(std::initializer_list<T> list) void>::type insert(std::initializer_list<T> list)
{ {
table_.insert_range(list.begin(), list.end()); table_.insert_range(list.begin(), list.end());
@ -903,9 +903,9 @@ namespace unordered
void insert(std::initializer_list<value_type>); void insert(std::initializer_list<value_type>);
#if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1800)) #if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1800))
template <typename T> template <typename T1>
typename boost::enable_if_c< typename boost::enable_if_c<
boost::is_convertible<T, value_type>::value, boost::is_convertible<T1, value_type>::value,
void>::type insert(std::initializer_list<T> list) void>::type insert(std::initializer_list<T> list)
{ {
table_.insert_range(list.begin(), list.end()); table_.insert_range(list.begin(), list.end());

8
include/boost/unordered/unordered_set.hpp
View File

@ -408,9 +408,9 @@ namespace unordered
void insert(std::initializer_list<value_type>); void insert(std::initializer_list<value_type>);
#if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1800)) #if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1800))
template <typename T> template <typename T1>
typename boost::enable_if_c< typename boost::enable_if_c<
boost::is_convertible<T, value_type>::value, boost::is_convertible<T1, value_type>::value,
void>::type insert(std::initializer_list<T> list) void>::type insert(std::initializer_list<T> list)
{ {
table_.insert_range(list.begin(), list.end()); table_.insert_range(list.begin(), list.end());
@ -888,9 +888,9 @@ namespace unordered
void insert(std::initializer_list<value_type>); void insert(std::initializer_list<value_type>);
#if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1800)) #if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1800))
template <typename T> template <typename T1>
typename boost::enable_if_c< typename boost::enable_if_c<
boost::is_convertible<T, value_type>::value, boost::is_convertible<T1, value_type>::value,
void>::type insert(std::initializer_list<T> list) void>::type insert(std::initializer_list<T> list)
{ {
table_.insert_range(list.begin(), list.end()); table_.insert_range(list.begin(), list.end());

10
test/unordered/insert_tests.cpp
View File

@ -582,10 +582,10 @@ struct initialize_from_two_ints
friend std::size_t hash_value(initialize_from_two_ints const& x) friend std::size_t hash_value(initialize_from_two_ints const& x)
{ {
return a + b; return x.a + x.b;
} }
bool operator==(initialize_from_two_ints const& x) bool operator==(initialize_from_two_ints const& x) const
{ {
return a == x.a && b == x.b; return a == x.a && b == x.b;
} }
@ -604,7 +604,7 @@ UNORDERED_AUTO_TEST(insert_initializer_list_set)
set2.insert({1, 2}); set2.insert({1, 2});
BOOST_TEST(set2.size() == 1); BOOST_TEST(set2.size() == 1);
BOOST_TEST(set2.find({1,2}) != set2.end()); BOOST_TEST(set2.find({1,2}) != set2.end());
BOOST_TEST(set2.find({2,1}) != set2.end()); BOOST_TEST(set2.find({2,1}) == set2.end());
set2.insert({{3,4},{5,6},{7,8}}); set2.insert({{3,4},{5,6},{7,8}});
BOOST_TEST(set2.size() == 4); BOOST_TEST(set2.size() == 4);
@ -612,7 +612,7 @@ UNORDERED_AUTO_TEST(insert_initializer_list_set)
BOOST_TEST(set2.find({3,4}) != set2.end()); BOOST_TEST(set2.find({3,4}) != set2.end());
BOOST_TEST(set2.find({5,6}) != set2.end()); BOOST_TEST(set2.find({5,6}) != set2.end());
BOOST_TEST(set2.find({7,8}) != set2.end()); BOOST_TEST(set2.find({7,8}) != set2.end());
BOOST_TEST(set2.find({8,7}) != set2.end()); BOOST_TEST(set2.find({8,7}) == set2.end());
set2.insert({{2, 1}, {3,4}}); set2.insert({{2, 1}, {3,4}});
BOOST_TEST(set2.size() == 5); BOOST_TEST(set2.size() == 5);
@ -621,7 +621,7 @@ UNORDERED_AUTO_TEST(insert_initializer_list_set)
BOOST_TEST(set2.find({3,4}) != set2.end()); BOOST_TEST(set2.find({3,4}) != set2.end());
BOOST_TEST(set2.find({5,6}) != set2.end()); BOOST_TEST(set2.find({5,6}) != set2.end());
BOOST_TEST(set2.find({7,8}) != set2.end()); BOOST_TEST(set2.find({7,8}) != set2.end());
BOOST_TEST(set2.find({8,7}) != set2.end()); BOOST_TEST(set2.find({8,7}) == set2.end());
} }
UNORDERED_AUTO_TEST(insert_initializer_list_multiset) UNORDERED_AUTO_TEST(insert_initializer_list_multiset)