From 475ee011bd5d522e78604ebc1249fdff2aa60d53 Mon Sep 17 00:00:00 2001
From: Robert Ramey <ramey@rrsd.com>
Date: Sun, 15 Jul 2012 17:35:09 +0000
Subject: [PATCH] merge to release

[SVN r79541]
---
 include/boost/serialization/detail/get_data.hpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/include/boost/serialization/detail/get_data.hpp b/include/boost/serialization/detail/get_data.hpp
index 0e9c1902..3cbcb4a3 100644
--- a/include/boost/serialization/detail/get_data.hpp
+++ b/include/boost/serialization/detail/get_data.hpp
@@ -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 @@ T* get_data(STD::vector<T,Allocator> const & v)
   return get_data(const_cast<STD::vector<T,Allocator>&>(v));
 }
 
-
 template <class T>
 T* get_data(STD::valarray<T>& v)
 {
@@ -50,6 +50,12 @@ const T* get_data(STD::valarray<T> const& v)
   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