generic-library/cereal
1
0
Fork 0
mirror of https://github.com/USCiLab/cereal.git synced 2025-10-18 01:45:52 +02:00
Code Issues Projects Releases Wiki Activity

out of order XML working properly:

Browse Source 
Errors in unittests turned out to be errors in the way the tests were written,
not in the actual XML archive.

Additional errors were due to improper loads in vector<bool>, which is now
fixed.
This commit is contained in:
Shane Grant
2013-09-06 17:14:44 -07:00
parent db0f1cf47f
commit 3fccebb030
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/cereal/types/vector.hpp
View File

@@ -101,7 +101,11 @@ namespace cereal
vector.resize( static_cast<std::size_t>( size ) ); vector.resize( static_cast<std::size_t>( size ) );
for( auto it = vector.begin(), end = vector.end(); it != end; ++it ) for( auto it = vector.begin(), end = vector.end(); it != end; ++it )
ar( static_cast<bool>( *it ) ); {
bool b;
ar( b );
*it = b;
}
} }
} // namespace cereal } // namespace cereal

8
unittests.cpp
View File

@@ -188,7 +188,7 @@ random_value(std::mt19937 & gen)
{ {
std::string s(std::uniform_int_distribution<int>(3, 30)(gen), ' '); std::string s(std::uniform_int_distribution<int>(3, 30)(gen), ' ');
for(char & c : s) for(char & c : s)
c = static_cast<char>( std::uniform_int_distribution<int>( '~', '~' )(gen) ); c = static_cast<char>( std::uniform_int_distribution<int>( 'A', 'Z' )(gen) );
return s; return s;
} }
@@ -197,7 +197,7 @@ std::basic_string<C> random_basic_string(std::mt19937 & gen)
{ {
std::basic_string<C> s(std::uniform_int_distribution<int>(3, 30)(gen), ' '); std::basic_string<C> s(std::uniform_int_distribution<int>(3, 30)(gen), ' ');
for(C & c : s) for(C & c : s)
c = static_cast<C>( std::uniform_int_distribution<int>( '~', '~' )(gen) ); c = static_cast<C>( std::uniform_int_distribution<int>( 'A', 'Z' )(gen) );
return s; return s;
} }
@@ -2961,7 +2961,7 @@ struct unordered_naming
{ {
ar( x, ar( x,
CEREAL_NVP(y), CEREAL_NVP(y),
z ); CEREAL_NVP(z) );
} }
bool operator==( unordered_naming const & other ) const bool operator==( unordered_naming const & other ) const
@@ -3035,7 +3035,7 @@ void test_unordered_loads()
{ {
IArchive iar(is); IArchive iar(is);
iar( cereal::make_nvp( name7, o_un7 ), iar( cereal::make_nvp( name7, i_un7 ),
cereal::make_nvp( name2, i_double2 ), cereal::make_nvp( name2, i_double2 ),
cereal::make_nvp( name4, i_int4 ), cereal::make_nvp( name4, i_int4 ),
cereal::make_nvp( name3, i_vecbool3 ), cereal::make_nvp( name3, i_vecbool3 ),