Merge pull request #1495

f3fdefe0 Fix multiple definition clash on ARMv7 build (Howard Chu)

external/boost/archive/portable_binary_iarchive.hpp

@@ -354,11 +354,11 @@ namespace detail {
     template class archive_serializer_map<portable_binary_iarchive>;
 }
 
-template class basic_binary_iprimitive<
-    portable_binary_iarchive,
-    std::istream::char_type, 
-    std::istream::traits_type
-> ;
+// template class basic_binary_iprimitive<
+//    portable_binary_iarchive,
+//    std::istream::char_type, 
+//    std::istream::traits_type
+//> ;
 
 } // namespace archive
 } // namespace boost

external/boost/archive/portable_binary_oarchive.hpp

@@ -295,11 +295,11 @@ namespace detail {
     template class archive_serializer_map<portable_binary_oarchive>;
 }
 
-template class basic_binary_oprimitive<
-    portable_binary_oarchive,
-    std::ostream::char_type, 
-    std::ostream::traits_type
-> ;
+// template class basic_binary_oprimitive<
+//     portable_binary_oarchive,
+//     std::ostream::char_type, 
+//     std::ostream::traits_type
+// > ;
 
 } // namespace archive
 } // namespace boost