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

Conflicts: include/cereal/types/string.hpp
USCiLab · Mar 9, 2014 · 9ca38db · 9ca38db
2 parents 44eb532 + 970aa9f
commit 9ca38db
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/sandbox_vs.cpp b/sandbox_vs.cpp
@@ -32,7 +32,7 @@
 #include <cereal/types/vector.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/json.hpp>
 

diff --git a/unittests.cpp b/unittests.cpp
@@ -1894,24 +1894,29 @@ void test_string_basic()
 
   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;
     {
       OArchive oar(os);
       oar(o_string);
+      oar(o_string2);
     }
 
     std::basic_string<char> i_string;
+    std::basic_string<char> i_string2;
 
     std::istringstream is(os.str());
     {
       IArchive iar(is);
 
       iar(i_string);
+      iar(i_string2);
     }
 
     BOOST_CHECK_EQUAL(i_string, o_string);
+    BOOST_CHECK_EQUAL(i_string2, o_string2);
   }
 }