Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r86478 - trunk/boost/unordered
From: dnljms_at_[hidden]
Date: 2013-10-27 09:14:13


Author: danieljames
Date: 2013-10-27 09:14:12 EDT (Sun, 27 Oct 2013)
New Revision: 86478
URL: http://svn.boost.org/trac/boost/changeset/86478

Log:
Revert attempted work around for Visual C++.

Text files modified:
   trunk/boost/unordered/unordered_map.hpp | 24 ------------------------
   trunk/boost/unordered/unordered_set.hpp | 24 ------------------------
   2 files changed, 0 insertions(+), 48 deletions(-)

Modified: trunk/boost/unordered/unordered_map.hpp
==============================================================================
--- trunk/boost/unordered/unordered_map.hpp Sun Oct 27 09:07:25 2013 (r86477)
+++ trunk/boost/unordered/unordered_map.hpp 2013-10-27 09:14:12 EDT (Sun, 27 Oct 2013) (r86478)
@@ -22,10 +22,6 @@
 
 #if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
 #include <initializer_list>
-
-#if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1800))
-#include <boost/type_traits/is_convertible.hpp>
-#endif
 #endif
 
 #if defined(BOOST_MSVC)
@@ -407,16 +403,6 @@
 
 #if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
         void insert(std::initializer_list<value_type>);
-
-#if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1800))
- template <typename T1>
- typename boost::enable_if_c<
- boost::is_convertible<T1, value_type>::value,
- void>::type insert(std::initializer_list<T> list)
- {
- table_.insert_range(list.begin(), list.end());
- }
-#endif
 #endif
 
         iterator erase(const_iterator);
@@ -901,16 +887,6 @@
 
 #if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
         void insert(std::initializer_list<value_type>);
-
-#if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1800))
- template <typename T1>
- typename boost::enable_if_c<
- boost::is_convertible<T1, value_type>::value,
- void>::type insert(std::initializer_list<T> list)
- {
- table_.insert_range(list.begin(), list.end());
- }
-#endif
 #endif
 
         iterator erase(const_iterator);

Modified: trunk/boost/unordered/unordered_set.hpp
==============================================================================
--- trunk/boost/unordered/unordered_set.hpp Sun Oct 27 09:07:25 2013 (r86477)
+++ trunk/boost/unordered/unordered_set.hpp 2013-10-27 09:14:12 EDT (Sun, 27 Oct 2013) (r86478)
@@ -22,10 +22,6 @@
 
 #if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
 #include <initializer_list>
-
-#if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1800))
-#include <boost/type_traits/is_convertible.hpp>
-#endif
 #endif
 
 #if defined(BOOST_MSVC)
@@ -406,16 +402,6 @@
 
 #if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
         void insert(std::initializer_list<value_type>);
-
-#if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1800))
- template <typename T1>
- typename boost::enable_if_c<
- boost::is_convertible<T1, value_type>::value,
- void>::type insert(std::initializer_list<T> list)
- {
- table_.insert_range(list.begin(), list.end());
- }
-#endif
 #endif
 
         iterator erase(const_iterator);
@@ -886,16 +872,6 @@
 
 #if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
         void insert(std::initializer_list<value_type>);
-
-#if BOOST_WORKAROUND(BOOST_MSVC, BOOST_TESTED_AT(1800))
- template <typename T1>
- typename boost::enable_if_c<
- boost::is_convertible<T1, value_type>::value,
- void>::type insert(std::initializer_list<T> list)
- {
- table_.insert_range(list.begin(), list.end());
- }
-#endif
 #endif
 
         iterator erase(const_iterator);


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk