Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r58002 - trunk/boost/unordered
From: daniel_james_at_[hidden]
Date: 2009-11-28 06:46:05


Author: danieljames
Date: 2009-11-28 06:46:05 EST (Sat, 28 Nov 2009)
New Revision: 58002
URL: http://svn.boost.org/trac/boost/changeset/58002

Log:
Try to support incomplete types for Sun - at the expense of zero argument emplace.
Text files modified:
   trunk/boost/unordered/unordered_map.hpp | 5 ++++-
   1 files changed, 4 insertions(+), 1 deletions(-)

Modified: trunk/boost/unordered/unordered_map.hpp
==============================================================================
--- trunk/boost/unordered/unordered_map.hpp (original)
+++ trunk/boost/unordered/unordered_map.hpp 2009-11-28 06:46:05 EST (Sat, 28 Nov 2009)
@@ -284,6 +284,7 @@
         }
 #else
 
+ #if !BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x5100))
         std::pair<iterator, bool> emplace(value_type const& v = value_type())
         {
             return boost::unordered_detail::pair_cast<iterator, bool>(
@@ -294,6 +295,7 @@
         {
             return iterator(table_.emplace(v).first);
         }
+ #endif
 
 #define BOOST_UNORDERED_EMPLACE(z, n, _) \
             template < \
@@ -786,6 +788,7 @@
         }
 #else
 
+ #if !BOOST_WORKAROUND(__SUNPRO_CC, BOOST_TESTED_AT(0x5100))
         iterator emplace(value_type const& v = value_type())
         {
             return iterator(table_.emplace(v));
@@ -796,7 +799,7 @@
         {
             return iterator(table_.emplace(v));
         }
-
+ #endif
 
 #define BOOST_UNORDERED_EMPLACE(z, n, _) \
             template < \


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