diff DEPENDENCIES/generic/include/boost/archive/binary_iarchive.hpp @ 101:c530137014c0

Update Boost headers (1.58.0)
author Chris Cannam
date Mon, 07 Sep 2015 11:12:49 +0100
parents 2665513ce2d3
children
line wrap: on
line diff
--- a/DEPENDENCIES/generic/include/boost/archive/binary_iarchive.hpp	Fri Sep 04 12:01:02 2015 +0100
+++ b/DEPENDENCIES/generic/include/boost/archive/binary_iarchive.hpp	Mon Sep 07 11:12:49 2015 +0100
@@ -2,7 +2,7 @@
 #define BOOST_ARCHIVE_BINARY_IARCHIVE_HPP
 
 // MS compatible compilers support #pragma once
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+#if defined(_MSC_VER)
 # pragma once
 #endif
 
@@ -25,44 +25,7 @@
 #  pragma warning(disable : 4511 4512)
 #endif
 
-namespace boost { 
-namespace archive {
-
-// do not derive from the classes below.  If you want to extend this functionality
-// via inhertance, derived from text_iarchive_impl instead.  This will
-// preserve correct static polymorphism.
-
-// same as binary_iarchive below - without the shared_ptr_helper
-class naked_binary_iarchive : 
-    public binary_iarchive_impl<
-        boost::archive::naked_binary_iarchive, 
-        std::istream::char_type, 
-        std::istream::traits_type
-    >
-{
-public:
-    naked_binary_iarchive(std::istream & is, unsigned int flags = 0) :
-        binary_iarchive_impl<
-            naked_binary_iarchive, std::istream::char_type, std::istream::traits_type
-        >(is, flags)
-    {}
-    naked_binary_iarchive(std::streambuf & bsb, unsigned int flags = 0) :
-        binary_iarchive_impl<
-            naked_binary_iarchive, std::istream::char_type, std::istream::traits_type
-        >(bsb, flags)
-    {}
-};
-
-} // namespace archive
-} // namespace boost
-
-// note special treatment of shared_ptr. This type needs a special
-// structure associated with every archive.  We created a "mix-in"
-// class to provide this functionality.  Since shared_ptr holds a
-// special esteem in the boost library - we included it here by default.
-#include <boost/archive/shared_ptr_helper.hpp>
-
-namespace boost { 
+namespace boost {
 namespace archive {
 
 // do not derive from this class.  If you want to extend this functionality
@@ -73,9 +36,7 @@
         boost::archive::binary_iarchive, 
         std::istream::char_type, 
         std::istream::traits_type
-    >,
-    public detail::shared_ptr_helper
-{
+    >{
 public:
     binary_iarchive(std::istream & is, unsigned int flags = 0) :
         binary_iarchive_impl<