diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-01-08 16:34:23 -0800 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-01-08 16:34:23 -0800 |
| commit | 3082e71b5a08b0282b19b2f6e01d06e1e47b0ce6 (patch) | |
| tree | d6ddfcd53e0da6c6874bbc15622f6ad33094adb6 | |
| parent | Merge pull request #1494 (diff) | |
| parent | Fix multiple definition clash on ARMv7 build (diff) | |
| download | monero-3082e71b5a08b0282b19b2f6e01d06e1e47b0ce6.tar.xz | |
Merge pull request #1495
f3fdefe0 Fix multiple definition clash on ARMv7 build (Howard Chu)
| -rw-r--r-- | external/boost/archive/portable_binary_iarchive.hpp | 10 | ||||
| -rw-r--r-- | 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 7149cca0f..c136e7d8a 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<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
diff --git a/external/boost/archive/portable_binary_oarchive.hpp b/external/boost/archive/portable_binary_oarchive.hpp index 8fd7090a1..be12b57aa 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<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
|