From f3fdefe001b15d042d0d3029c0734aedf2a7b7ce Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Fri, 23 Dec 2016 18:04:12 +0000 Subject: [PATCH] Fix multiple definition clash on ARMv7 build Broken by d1d6e27ab661f71d90fb6530db84d5a2b92550a8 --- external/boost/archive/portable_binary_iarchive.hpp | 10 +++++----- external/boost/archive/portable_binary_oarchive.hpp | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/external/boost/archive/portable_binary_iarchive.hpp b/external/boost/archive/portable_binary_iarchive.hpp index 7149cca0..c136e7d8 100644 --- a/external/boost/archive/portable_binary_iarchive.hpp +++ b/external/boost/archive/portable_binary_iarchive.hpp @@ -354,11 +354,11 @@ namespace detail { template class archive_serializer_map; } -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 diff --git a/external/boost/archive/portable_binary_oarchive.hpp b/external/boost/archive/portable_binary_oarchive.hpp index 8fd7090a..be12b57a 100644 --- a/external/boost/archive/portable_binary_oarchive.hpp +++ b/external/boost/archive/portable_binary_oarchive.hpp @@ -295,11 +295,11 @@ namespace detail { template class archive_serializer_map; } -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