Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r84821 - trunk/boost/geometry/index/detail
From: adam.wulkiewicz_at_[hidden]
Date: 2013-06-17 20:16:01


Author: awulkiew
Date: 2013-06-17 20:16:01 EDT (Mon, 17 Jun 2013)
New Revision: 84821
URL: http://svn.boost.org/trac/boost/changeset/84821

Log:
[geometry][index]: boost::swap() for unsigned ints changed to std::swap() because of error C2872: 'swap' : ambiguous symbol in msvc 8 and 9.

Text files modified:
   trunk/boost/geometry/index/detail/varray.hpp | 6 +++---
   1 files changed, 3 insertions(+), 3 deletions(-)

Modified: trunk/boost/geometry/index/detail/varray.hpp
==============================================================================
--- trunk/boost/geometry/index/detail/varray.hpp Mon Jun 17 18:23:35 2013 (r84820)
+++ trunk/boost/geometry/index/detail/varray.hpp 2013-06-17 20:16:01 EDT (Mon, 17 Jun 2013) (r84821)
@@ -1529,7 +1529,7 @@
         this->clear();
 
         ::memcpy(this->data(), other.data(), sizeof(Value) * other.m_size);
- boost::swap(m_size, other.m_size);
+ std::swap(m_size, other.m_size);
     }
 
     // @par Throws
@@ -1577,7 +1577,7 @@
         ::memcpy(this->data(), other.data(), sizeof(Value) * other.size());
         ::memcpy(other.data(), temp_ptr, sizeof(Value) * this->size());
 
- boost::swap(m_size, other.m_size);
+ std::swap(m_size, other.m_size);
     }
 
     // @par Throws
@@ -1597,7 +1597,7 @@
             swap_dispatch_impl(this->begin(), this->end(), other.begin(), other.end(), use_memop_in_swap_and_move()); // may throw
         else
             swap_dispatch_impl(other.begin(), other.end(), this->begin(), this->end(), use_memop_in_swap_and_move()); // may throw
- boost::swap(m_size, other.m_size);
+ std::swap(m_size, other.m_size);
     }
 
     // @par Throws


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