Fixed union

Author: liuzicheng1987

include/rfl/cereal/Reader.hpp

@@ -107,11 +107,7 @@ struct Reader {
       for (::cereal::size_type i = 0; i < size; ++i) {
         std::string key;
         (*_map.archive_)(key);
-        const auto err = _map_reader.read(std::string_view(key),
-                                          InputVarType{_map.archive_});
-        if (err) {
-          return err;
-        }
+        _map_reader.read(std::string_view(key), InputVarType{_map.archive_});
       }
       return std::nullopt;
     } catch (std::exception& e) {
@@ -135,7 +131,7 @@ struct Reader {
   template <class T, class UnionReader>
   rfl::Result<T> read_union(const InputUnionType& _union) const noexcept {
     try {
-      std::int32_t index;
+      size_t index;
       (*_union.archive_)(index);
       return UnionReader::read(*this, index, InputVarType{_union.archive_});
     } catch (std::exception& e) {

include/rfl/cereal/Writer.hpp

@@ -85,6 +85,7 @@ class Writer {
 
   OutputArrayType add_array_to_union(const size_t _index, const size_t _size,
                                      OutputUnionType* _parent) const {
+    (*archive_)(_index);
     (*archive_)(::cereal::make_size_tag(_size));
     return OutputArrayType{};
   }
@@ -111,6 +112,7 @@ class Writer {
 
   OutputMapType add_map_to_union(const size_t _index, const size_t _size,
                                  OutputUnionType* _parent) const {
+    (*archive_)(_index);
     (*archive_)(::cereal::make_size_tag(_size));
     return OutputMapType{};
   }
@@ -134,6 +136,7 @@ class Writer {
 
   OutputObjectType add_object_to_union(const size_t _index, const size_t _size,
                                        OutputUnionType* _parent) const {
+    (*archive_)(_index);
     return OutputObjectType{};
   }
 
@@ -153,6 +156,7 @@ class Writer {
 
   OutputUnionType add_union_to_union(const size_t _index,
                                      OutputUnionType* _parent) const {
+    (*archive_)(_index);
     return OutputUnionType{};
   }
 
@@ -179,6 +183,7 @@ class Writer {
   template <class T>
   OutputVarType add_value_to_union(const size_t _index, const T& _var,
                                    OutputUnionType* _parent) const {
+    (*archive_)(_index);
     (*archive_)(_var);
     return OutputVarType{};
   }
@@ -199,6 +204,7 @@ class Writer {
 
   OutputVarType add_null_to_union(const size_t _index,
                                   OutputUnionType* _parent) const {
+    (*archive_)(_index);
     return OutputVarType{};
   }
 

include/rfl/cereal/write.hpp

@@ -35,7 +35,7 @@ std::vector<char> write(const auto& _obj) {
 /// Writes Cereal binary format into an ostream.
 template <class... Ps>
 std::ostream& write(const auto& _obj, std::ostream& _stream) {
-  ::cereal::BinaryOutputArchive archive(_stream);
+  ::cereal::PortableBinaryOutputArchive archive(_stream);
   write<std::remove_cvref_t<decltype(_obj)>, Ps...>(_obj, archive);
   return _stream;
 }

tests/cereal/CMakeLists.txt

@@ -1,6 +1,6 @@
 project(reflect-cpp-cereal-tests)
 
-file(GLOB_RECURSE SOURCES CONFIGURE_DEPENDS "test_readme_example.cpp")
+file(GLOB_RECURSE SOURCES CONFIGURE_DEPENDS "*.cpp")
 
 add_executable(
     reflect-cpp-cereal-tests 

tests/cereal/test_map.cpp

@@ -8,23 +8,19 @@
 #include "write_and_read.hpp"
 
 namespace test_map {
+
 struct Person {
   rfl::Rename<"firstName", std::string> first_name;
   rfl::Rename<"lastName", std::string> last_name = "Simpson";
   std::unique_ptr<std::map<std::string, Person>> children;
 };
 
 TEST(cereal, test_map) {
-  auto bart = Person{.first_name = "Bart"};
-
-  auto lisa = Person{.first_name = "Lisa"};
-
-  auto maggie = Person{.first_name = "Maggie"};
+  auto children = std::make_unique<std::map<std::string, Person>>();
 
-  auto children = std::make_unique<std::map<std::string, Person>>(
-      std::map<std::string, Person>({{"Bart", std::move(bart)},
-                                     {"Lisa", std::move(lisa)},
-                                     {"Maggie", std::move(maggie)}}));
+  children->insert(std::make_pair("Bart", Person{.first_name = "Bart"}));
+  children->insert(std::make_pair("Lisa", Person{.first_name = "Lisa"}));
+  children->insert(std::make_pair("Maggie", Person{.first_name = "Maggie"}));
 
   const auto homer =
       Person{.first_name = "Homer", .children = std::move(children)};

tests/cereal/test_tuple.cpp

@@ -10,7 +10,6 @@
 namespace test_tuple {
 
 TEST(cereal, test_tuple) {
-  using TupleType = std::tuple<int, std::string, bool, double>;
   const auto my_tuple = std::make_tuple(42, std::string("Hello"), true, 3.14);
   write_and_read(my_tuple);
 }