diff options
| author | Howard Chu <hyc@symas.com> | 2016-12-23 18:04:12 +0000 |
|---|---|---|
| committer | Howard Chu <hyc@symas.com> | 2016-12-23 18:05:11 +0000 |
| commit | f3fdefe001b15d042d0d3029c0734aedf2a7b7ce (patch) | |
| tree | 8170892cd6305131ad570bfa5f15c0c51f802c5f /external/boost | |
| parent | Merge pull request #1487 (diff) | |
| download | monero-f3fdefe001b15d042d0d3029c0734aedf2a7b7ce.tar.xz | |
Fix multiple definition clash on ARMv7 build
Broken by d1d6e27ab661f71d90fb6530db84d5a2b92550a8
Diffstat (limited to 'external/boost')
| -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
|