From eb6faaf428d7ee7259be77ca488c190cf244f3fa Mon Sep 17 00:00:00 2001
From: Robert Ramey <ramey@rrsd.com>
Date: Thu, 14 Jan 2016 22:18:51 -0800
Subject: [PATCH] minor adjustments to fix errors with gcc 6.0

---
 include/boost/archive/binary_iarchive_impl.hpp    | 3 ++-
 include/boost/archive/binary_oarchive_impl.hpp    | 3 ++-
 include/boost/archive/detail/basic_serializer.hpp | 4 +---
 test/dll_base.cpp                                 | 8 ++++----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/include/boost/archive/binary_iarchive_impl.hpp b/include/boost/archive/binary_iarchive_impl.hpp
index 3ff994ad..d6b217b4 100644
--- a/include/boost/archive/binary_iarchive_impl.hpp
+++ b/include/boost/archive/binary_iarchive_impl.hpp
@@ -58,8 +58,9 @@ protected:
         this->basic_binary_iarchive<Archive>::load_override(t);
     }
     void init(unsigned int flags){
-        if(0 != (flags & no_header))
+        if(0 != (flags & no_header)){
             return;
+        }
         #if ! defined(__MWERKS__)
             this->basic_binary_iarchive<Archive>::init();
             this->basic_binary_iprimitive<Archive, Elem, Tr>::init();
diff --git a/include/boost/archive/binary_oarchive_impl.hpp b/include/boost/archive/binary_oarchive_impl.hpp
index 76e3a656..11793271 100644
--- a/include/boost/archive/binary_oarchive_impl.hpp
+++ b/include/boost/archive/binary_oarchive_impl.hpp
@@ -59,8 +59,9 @@ protected:
         this->basic_binary_oarchive<Archive>::save_override(t);
     }
     void init(unsigned int flags) {
-        if(0 != (flags & no_header))
+        if(0 != (flags & no_header)){
             return;
+        }
         #if ! defined(__MWERKS__)
             this->basic_binary_oarchive<Archive>::init();
             this->basic_binary_oprimitive<Archive, Elem, Tr>::init();
diff --git a/include/boost/archive/detail/basic_serializer.hpp b/include/boost/archive/detail/basic_serializer.hpp
index c7d3b4be..f9c4203f 100644
--- a/include/boost/archive/detail/basic_serializer.hpp
+++ b/include/boost/archive/detail/basic_serializer.hpp
@@ -41,9 +41,7 @@ protected:
         const boost::serialization::extended_type_info & eti
     ) : 
         m_eti(& eti)
-    {
-        BOOST_ASSERT(NULL != & eti);
-    }
+    {}
 public:
     inline bool 
     operator<(const basic_serializer & rhs) const {
diff --git a/test/dll_base.cpp b/test/dll_base.cpp
index 728e18c4..87645b4d 100644
--- a/test/dll_base.cpp
+++ b/test/dll_base.cpp
@@ -37,19 +37,19 @@ void base::serialize(
 // explicit instantiation in this case.
 //BOOST_CLASS_EXPORT(polymorphic_base)
 
-template BOOST_SYMBOL_EXPORT base::serialize(
+template BOOST_SYMBOL_EXPORT void base::serialize(
     boost::archive::text_oarchive & ar,
     const unsigned int version
 );
-template BOOST_SYMBOL_EXPORT base::serialize(
+template BOOST_SYMBOL_EXPORT void base::serialize(
     boost::archive::text_iarchive & ar,
     const unsigned int version
 );
-template BOOST_SYMBOL_EXPORT base::serialize(
+template BOOST_SYMBOL_EXPORT void base::serialize(
     boost::archive::polymorphic_oarchive & ar,
     const unsigned int version
 );
-template BOOST_SYMBOL_EXPORT base::serialize(
+template BOOST_SYMBOL_EXPORT void base::serialize(
     boost::archive::polymorphic_iarchive & ar,
     const unsigned int version
 );