Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1495 

f3fdefe0 Fix multiple definition clash on ARMv7 build (Howard Chu)
This commit is contained in:
Riccardo Spagni 2017-01-08 16:34:23 -08:00
parent c594e578a9 f3fdefe001
commit 3082e71b5a
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
external/boost/archive/portable_binary_iarchive.hpp vendored
View File

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

10
external/boost/archive/portable_binary_oarchive.hpp vendored
View File

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