boost: update to 1.42.0

[features.git] / boost / boost / exception / detail / object_hex_dump.hpp

diff --git a/boost/boost/exception/detail/object_hex_dump.hpp b/boost/boost/exception/detail/object_hex_dump.hpp
index f535944ea297dc5c46875ffa1a565775c17e6dc6..ccf1bac3f74006920f3860385b4c5db97d51fdb9 100755 (executable)
--- a/boost/boost/exception/detail/object_hex_dump.hpp
+++ b/boost/boost/exception/detail/object_hex_dump.hpp
@@ -5,12 +5,19 @@
 
 #ifndef UUID_6F463AC838DF11DDA3E6909F56D89593
 #define UUID_6F463AC838DF11DDA3E6909F56D89593
+#if defined(__GNUC__) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS)
+#pragma GCC system_header
+#endif
+#if defined(_MSC_VER) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS)
+#pragma warning(push,1)
+#endif
 
 #include <boost/exception/detail/type_info.hpp>
 #include <iomanip>
 #include <ios>
 #include <string>
 #include <sstream>
+#include <cstdlib>
 
 namespace
 boost
@@ -21,11 +28,11 @@ boost
         template <class T>
         inline
         std::string
-        object_hex_dump( T const & x, size_t max_size=16 )
+        object_hex_dump( T const & x, std::size_t max_size=16 )
             {
             std::ostringstream s;
             s << "type: " << type_name<T>() << ", size: " << sizeof(T) << ", dump: ";
-            size_t n=sizeof(T)>max_size?max_size:sizeof(T);
+            std::size_t n=sizeof(T)>max_size?max_size:sizeof(T);
             s.fill('0');
             s.width(2);
             unsigned char const * b=reinterpret_cast<unsigned char const *>(&x);
@@ -37,4 +44,7 @@ boost
         }
     }
 
+#if defined(_MSC_VER) && !defined(BOOST_EXCEPTION_ENABLE_WARNINGS)
+#pragma warning(pop)
+#endif
 #endif