From 6a8506d9591824bffce1b8ab9d9d240ed895a8be Mon Sep 17 00:00:00 2001 From: Daniel James Date: Thu, 3 Sep 2009 07:37:14 +0000 Subject: [PATCH] Remove some old Visual C++ workarounds. [SVN r55991] --- include/boost/unordered/unordered_map.hpp | 10 ++-------- include/boost/unordered/unordered_set.hpp | 10 ++-------- 2 files changed, 4 insertions(+), 16 deletions(-) diff --git a/include/boost/unordered/unordered_map.hpp b/include/boost/unordered/unordered_map.hpp index 5eb0eae5..8880a029 100644 --- a/include/boost/unordered/unordered_map.hpp +++ b/include/boost/unordered/unordered_map.hpp @@ -485,10 +485,7 @@ namespace boost table_.rehash(n); } -#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) - friend bool operator==(unordered_map const&, unordered_map const&); - friend bool operator!=(unordered_map const&, unordered_map const&); -#elif !BOOST_WORKAROUND(__BORLANDC__, < 0x0582) +#if !BOOST_WORKAROUND(__BORLANDC__, < 0x0582) friend bool operator==(unordered_map const&, unordered_map const&); friend bool operator!=(unordered_map const&, unordered_map const&); #endif @@ -945,10 +942,7 @@ namespace boost table_.rehash(n); } -#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) - friend bool operator==(unordered_multimap const&, unordered_multimap const&); - friend bool operator!=(unordered_multimap const&, unordered_multimap const&); -#elif !BOOST_WORKAROUND(__BORLANDC__, < 0x0582) +#if !BOOST_WORKAROUND(__BORLANDC__, < 0x0582) friend bool operator==(unordered_multimap const&, unordered_multimap const&); friend bool operator!=(unordered_multimap const&, unordered_multimap const&); #endif diff --git a/include/boost/unordered/unordered_set.hpp b/include/boost/unordered/unordered_set.hpp index 942f3516..c6ef5fc7 100644 --- a/include/boost/unordered/unordered_set.hpp +++ b/include/boost/unordered/unordered_set.hpp @@ -454,10 +454,7 @@ namespace boost table_.rehash(n); } -#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) - friend bool operator==(unordered_set const&, unordered_set const&); - friend bool operator!=(unordered_set const&, unordered_set const&); -#elif !BOOST_WORKAROUND(__BORLANDC__, < 0x0582) +#if !BOOST_WORKAROUND(__BORLANDC__, < 0x0582) friend bool operator==(unordered_set const&, unordered_set const&); friend bool operator!=(unordered_set const&, unordered_set const&); #endif @@ -894,10 +891,7 @@ namespace boost table_.rehash(n); } -#if BOOST_WORKAROUND(BOOST_MSVC, < 1300) - friend bool operator==(unordered_multiset const&, unordered_multiset const&); - friend bool operator!=(unordered_multiset const&, unordered_multiset const&); -#elif !BOOST_WORKAROUND(__BORLANDC__, < 0x0582) +#if !BOOST_WORKAROUND(__BORLANDC__, < 0x0582) friend bool operator==(unordered_multiset const&, unordered_multiset const&); friend bool operator!=(unordered_multiset const&, unordered_multiset const&); #endif