[Boost-commit] svn:boost r79541 - in branches/release/boost/serialization: . detail

Subject: [Boost-commit] svn:boost r79541 - in branches/release/boost/serialization: . detail
From: ramey_at_[hidden]
Date: 2012-07-15 13:35:09

Author: ramey
Date: 2012-07-15 13:35:09 EDT (Sun, 15 Jul 2012)
New Revision: 79541
URL: http://svn.boost.org/trac/boost/changeset/79541

Log:
merge to release
Properties modified: 
   branches/release/boost/serialization/   (props changed)
Text files modified: 
   branches/release/boost/serialization/detail/get_data.hpp |    14 ++++++++++----                          
   1 files changed, 10 insertions(+), 4 deletions(-)

Modified: branches/release/boost/serialization/detail/get_data.hpp
==============================================================================
--- branches/release/boost/serialization/detail/get_data.hpp	(original)
+++ branches/release/boost/serialization/detail/get_data.hpp	2012-07-15 13:35:09 EDT (Sun, 15 Jul 2012)
@@ -19,11 +19,12 @@
 #define STD std
 #endif
 
-
 #include <vector>
 #include <valarray>
 
-namespace boost { namespace serialization { namespace detail {
+namespace boost {
+namespace serialization { 
+namespace detail {
 
 template <class T, class Allocator>
 T* get_data(STD::vector<T,Allocator>& v)
@@ -37,7 +38,6 @@
   return get_data(const_cast<STD::vector<T,Allocator>&>(v));
 }
 
-
 template <class T>
 T* get_data(STD::valarray<T>& v)
 {
@@ -50,6 +50,12 @@
   return get_data(const_cast<STD::valarray<T>&>(v));
 }
 
-} } } //namespace boost::serialization::detail
+} // detail
+} // serialization
+} // boost
+
+#if defined(__SGI_STL_PORT) || defined(_STLPORT_VERSION)
+#undef STD
+#endif
 
 #endif // BOOST_SERIALIZATION_DETAIL_GET_DATA_HPP