boost/serialization
2
0
Fork 0
mirror of https://github.com/boostorg/serialization.git synced 2026-01-30 20:22:09 +00:00
Code Issues Projects Releases Wiki Activity

minor adjustments to fix errors with gcc 6.0

Browse Source
This commit is contained in:
Robert Ramey
2016-01-14 22:18:51 -08:00
parent 587b081d1d
commit eb6faaf428
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/boost/archive/binary_iarchive_impl.hpp
View File

@@ -58,8 +58,9 @@ protected:
this->basic_binary_iarchive<Archive>::load_override(t);
}
void init(unsigned int flags){
if(0 != (flags & no_header))
if(0 != (flags & no_header)){
return;
}
#if ! defined(__MWERKS__)
this->basic_binary_iarchive<Archive>::init();
this->basic_binary_iprimitive<Archive, Elem, Tr>::init();

3
include/boost/archive/binary_oarchive_impl.hpp
View File

@@ -59,8 +59,9 @@ protected:
this->basic_binary_oarchive<Archive>::save_override(t);
}
void init(unsigned int flags) {
if(0 != (flags & no_header))
if(0 != (flags & no_header)){
return;
}
#if ! defined(__MWERKS__)
this->basic_binary_oarchive<Archive>::init();
this->basic_binary_oprimitive<Archive, Elem, Tr>::init();

4
include/boost/archive/detail/basic_serializer.hpp
View File

@@ -41,9 +41,7 @@ protected:
const boost::serialization::extended_type_info & eti
) :
m_eti(& eti)
{
BOOST_ASSERT(NULL != & eti);
}
{}
public:
inline bool
operator<(const basic_serializer & rhs) const {

8
test/dll_base.cpp
View File

@@ -37,19 +37,19 @@ void base::serialize(
// explicit instantiation in this case.
//BOOST_CLASS_EXPORT(polymorphic_base)
template BOOST_SYMBOL_EXPORT base::serialize(
template BOOST_SYMBOL_EXPORT void base::serialize(
boost::archive::text_oarchive & ar,
const unsigned int version
);
template BOOST_SYMBOL_EXPORT base::serialize(
template BOOST_SYMBOL_EXPORT void base::serialize(
boost::archive::text_iarchive & ar,
const unsigned int version
);
template BOOST_SYMBOL_EXPORT base::serialize(
template BOOST_SYMBOL_EXPORT void base::serialize(
boost::archive::polymorphic_oarchive & ar,
const unsigned int version
);
template BOOST_SYMBOL_EXPORT base::serialize(
template BOOST_SYMBOL_EXPORT void base::serialize(
boost::archive::polymorphic_iarchive & ar,
const unsigned int version
);