[Boost-commit] svn:boost r63526 - in trunk/boost: archive archive/detail serialization

Subject: [Boost-commit] svn:boost r63526 - in trunk/boost: archive archive/detail serialization
From: ramey_at_[hidden]
Date: 2010-07-02 14:26:57

Author: ramey
Date: 2010-07-02 14:26:55 EDT (Fri, 02 Jul 2010)
New Revision: 63526
URL: http://svn.boost.org/trac/boost/changeset/63526

Log:
adjustments to address auto_link issue on MingW
Text files modified: 
   trunk/boost/archive/basic_binary_iprimitive.hpp          |     2 +-                                      
   trunk/boost/archive/basic_binary_oprimitive.hpp          |     2 +-                                      
   trunk/boost/archive/basic_xml_archive.hpp                |     2 +-                                      
   trunk/boost/archive/detail/auto_link_archive.hpp         |     2 +-                                      
   trunk/boost/serialization/config.hpp                     |     5 ++++-                                   
   trunk/boost/serialization/extended_type_info.hpp         |     2 +-                                      
   trunk/boost/serialization/extended_type_info_no_rtti.hpp |     2 +-                                      
   trunk/boost/serialization/void_cast.hpp                  |     3 ++-                                     
   8 files changed, 12 insertions(+), 8 deletions(-)

Modified: trunk/boost/archive/basic_binary_iprimitive.hpp
==============================================================================
--- trunk/boost/archive/basic_binary_iprimitive.hpp	(original)
+++ trunk/boost/archive/basic_binary_iprimitive.hpp	2010-07-02 14:26:55 EDT (Fri, 02 Jul 2010)
@@ -51,10 +51,10 @@
 
 #include <boost/archive/basic_streambuf_locale_saver.hpp>
 #include <boost/archive/archive_exception.hpp>
-#include <boost/archive/detail/auto_link_archive.hpp>
 #include <boost/mpl/placeholders.hpp>
 #include <boost/serialization/is_bitwise_serializable.hpp>
 #include <boost/serialization/array.hpp>
+#include <boost/archive/detail/auto_link_archive.hpp>
 #include <boost/archive/detail/abi_prefix.hpp> // must be the last header
 
 namespace boost { 

Modified: trunk/boost/archive/basic_binary_oprimitive.hpp
==============================================================================
--- trunk/boost/archive/basic_binary_oprimitive.hpp	(original)
+++ trunk/boost/archive/basic_binary_oprimitive.hpp	2010-07-02 14:26:55 EDT (Fri, 02 Jul 2010)
@@ -45,10 +45,10 @@
 
 #include <boost/archive/basic_streambuf_locale_saver.hpp>
 #include <boost/archive/archive_exception.hpp>
-#include <boost/archive/detail/auto_link_archive.hpp>
 #include <boost/serialization/is_bitwise_serializable.hpp>
 #include <boost/mpl/placeholders.hpp>
 #include <boost/serialization/array.hpp>
+#include <boost/archive/detail/auto_link_archive.hpp>
 #include <boost/archive/detail/abi_prefix.hpp> // must be the last header
 
 namespace boost {

Modified: trunk/boost/archive/basic_xml_archive.hpp
==============================================================================
--- trunk/boost/archive/basic_xml_archive.hpp	(original)
+++ trunk/boost/archive/basic_xml_archive.hpp	2010-07-02 14:26:55 EDT (Fri, 02 Jul 2010)
@@ -16,9 +16,9 @@
 
 //  See http://www.boost.org for updates, documentation, and revision history.
 
-#include <boost/archive/detail/auto_link_archive.hpp>
 #include <boost/archive/archive_exception.hpp>
 
+#include <boost/archive/detail/auto_link_archive.hpp>
 #include <boost/archive/detail/abi_prefix.hpp> // must be the last header
 
 namespace boost { 

Modified: trunk/boost/archive/detail/auto_link_archive.hpp
==============================================================================
--- trunk/boost/archive/detail/auto_link_archive.hpp	(original)
+++ trunk/boost/archive/detail/auto_link_archive.hpp	2010-07-02 14:26:55 EDT (Fri, 02 Jul 2010)
@@ -45,4 +45,4 @@
     #include <boost/config/auto_link.hpp>
 #endif  // auto-linking disabled
 
-#endif // ARCHIVE_DETAIL_AUTO_LINK_ARCHIVE_HPP
+#endif // BOOST_ARCHIVE_DETAIL_AUTO_LINK_ARCHIVE_HPP

Modified: trunk/boost/serialization/config.hpp
==============================================================================
--- trunk/boost/serialization/config.hpp	(original)
+++ trunk/boost/serialization/config.hpp	2010-07-02 14:26:55 EDT (Fri, 02 Jul 2010)
@@ -1,4 +1,5 @@
-// note lack of include guards.  This is intentional
+#ifndef BOOST_SERIALIZATION_CONFIG_HPP
+#define BOOST_SERIALIZATION_CONFIG_HPP
 
 //  config.hpp  ---------------------------------------------//
 
@@ -80,3 +81,5 @@
     #include <boost/config/auto_link.hpp>
 
 #endif  
+
+#endif // BOOST_SERIALIZATION_CONFIG_HPP

Modified: trunk/boost/serialization/extended_type_info.hpp
==============================================================================
--- trunk/boost/serialization/extended_type_info.hpp	(original)
+++ trunk/boost/serialization/extended_type_info.hpp	2010-07-02 14:26:55 EDT (Fri, 02 Jul 2010)
@@ -23,9 +23,9 @@
 #include <cstddef> // NULL
 #include <boost/config.hpp>
 #include <boost/noncopyable.hpp>
-#include <boost/serialization/config.hpp>
 #include <boost/mpl/bool.hpp>
 
+#include <boost/serialization/config.hpp>
 #include <boost/config/abi_prefix.hpp> // must be the last header
 #ifdef BOOST_MSVC
 #  pragma warning(push)

Modified: trunk/boost/serialization/extended_type_info_no_rtti.hpp
==============================================================================
--- trunk/boost/serialization/extended_type_info_no_rtti.hpp	(original)
+++ trunk/boost/serialization/extended_type_info_no_rtti.hpp	2010-07-02 14:26:55 EDT (Fri, 02 Jul 2010)
@@ -26,13 +26,13 @@
 #include <boost/type_traits/is_polymorphic.hpp>
 #include <boost/type_traits/remove_const.hpp>
 
-#include <boost/serialization/config.hpp>
 #include <boost/serialization/static_warning.hpp>
 #include <boost/serialization/singleton.hpp>
 #include <boost/serialization/extended_type_info.hpp>
 #include <boost/serialization/factory.hpp>
 #include <boost/serialization/throw_exception.hpp>
 
+#include <boost/serialization/config.hpp>
 // hijack serialization access
 #include <boost/serialization/access.hpp>
 

Modified: trunk/boost/serialization/void_cast.hpp
==============================================================================
--- trunk/boost/serialization/void_cast.hpp	(original)
+++ trunk/boost/serialization/void_cast.hpp	2010-07-02 14:26:55 EDT (Fri, 02 Jul 2010)
@@ -18,9 +18,9 @@
 //  See http://www.boost.org for updates, documentation, and revision history.
 
 #include <cstddef> // for ptrdiff_t
+#include <boost/config.hpp>
 #include <boost/noncopyable.hpp>
 
-#include <boost/serialization/config.hpp>
 #include <boost/serialization/smart_cast.hpp>
 #include <boost/serialization/singleton.hpp>
 #include <boost/serialization/force_include.hpp>
@@ -29,6 +29,7 @@
 #include <boost/type_traits/is_virtual_base_of.hpp>
 #include <boost/serialization/void_cast_fwd.hpp>
 
+#include <boost/serialization/config.hpp>
 #include <boost/config/abi_prefix.hpp> // must be the last header
 
 #ifdef BOOST_MSVC