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

Merge branch 'develop' of github.com:USCiLab/cereal into develop

Browse Source 
Conflicts:
	include/cereal/types/string.hpp
This commit is contained in:
Shane Grant
2014-03-08 22:34:13 -08:00
parent 44eb532548 970aa9f07d
commit 9ca38dba65
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sandbox_vs.cpp
View File

@@ -32,7 +32,7 @@
#include <cereal/types/vector.hpp> #include <cereal/types/vector.hpp>
#include <cereal/archives/binary.hpp> #include <cereal/archives/binary.hpp>
//#include <cereal/archives/portable_binary.hpp> #include <cereal/archives/portable_binary.hpp>
#include <cereal/archives/xml.hpp> #include <cereal/archives/xml.hpp>
#include <cereal/archives/json.hpp> #include <cereal/archives/json.hpp>

7
unittests.cpp
View File

@@ -1894,24 +1894,29 @@ void test_string_basic()
for(size_t i=0; i<100; ++i) for(size_t i=0; i<100; ++i)
{ {
std::basic_string<char> o_string = random_basic_string<char>(gen); std::basic_string<char> o_string = random_basic_string<char>(gen);
std::basic_string<char> o_string2 = "";
std::ostringstream os; std::ostringstream os;
{ {
OArchive oar(os); OArchive oar(os);
oar(o_string); oar(o_string);
oar(o_string2);
} }
std::basic_string<char> i_string; std::basic_string<char> i_string;
std::basic_string<char> i_string2;
std::istringstream is(os.str()); std::istringstream is(os.str());
{ {
IArchive iar(is); IArchive iar(is);
iar(i_string); iar(i_string);
iar(i_string2);
} }
BOOST_CHECK_EQUAL(i_string, o_string); BOOST_CHECK_EQUAL(i_string, o_string);
BOOST_CHECK_EQUAL(i_string2, o_string2);
} }
} }