Fmall fixes.

olympus-robotics · Sep 29, 2024 · 602216b · 602216b
1 parent 115a883
commit 602216b
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 19 deletions.
diff --git a/modules/serdes/CMakeLists.txt b/modules/serdes/CMakeLists.txt
@@ -16,28 +16,24 @@ find_package(range-v3 REQUIRED)
 
 # library sources
 set(SOURCES
-    src/serdes.cpp
-    src/type_info.cpp
-    src/dynamic_deserializer.cpp
-    src/protobuf/buffers.cpp
-    src/protobuf/dynamic_deserializer.cpp
     src/protobuf/buffers.cpp
     src/protobuf/dynamic_deserializer.cpp
     src/protobuf/enums.cpp
-    src/protobuf/protobuf.cpp
     src/protobuf/protobuf_internal.cpp
+    src/protobuf/protobuf.cpp
+    src/dynamic_deserializer.cpp
+    src/serdes.cpp
+    src/type_info.cpp
     README.md
-    include/hephaestus/serdes/dynamic_deserializer.h
-    include/hephaestus/serdes/serdes.h
-    include/hephaestus/serdes/type_info.h
-    include/hephaestus/serdes/protobuf/buffers.h
-    include/hephaestus/serdes/protobuf/concepts.h
     include/hephaestus/serdes/protobuf/buffers.h
     include/hephaestus/serdes/protobuf/concepts.h
-    include/hephaestus/serdes/protobuf/enums.h
     include/hephaestus/serdes/protobuf/dynamic_deserializer.h
-    include/hephaestus/serdes/protobuf/protobuf.h
+    include/hephaestus/serdes/protobuf/enums.h
     include/hephaestus/serdes/protobuf/protobuf_internal.h
+    include/hephaestus/serdes/protobuf/protobuf.h
+    include/hephaestus/serdes/dynamic_deserializer.h
+    include/hephaestus/serdes/serdes.h
+    include/hephaestus/serdes/type_info.h
 )
 
 # library target

diff --git a/modules/types/include/hephaestus/types/dummy_type.h b/modules/types/include/hephaestus/types/dummy_type.h
@@ -56,8 +56,8 @@ struct DummyType {
 
   DummyPrimitivesType dummy_primitives_type{};
 
-  InternalDummyEnum internal_dummy_enum{ InternalDummyEnum::ALPHA };
-  ExternalDummyEnum external_dummy_enum{ ExternalDummyEnum::A };
+  InternalDummyEnum internal_dummy_enum{};
+  ExternalDummyEnum external_dummy_enum{};
 
   std::string dummy_string{};
   std::vector<int32_t> dummy_vector{};

diff --git a/modules/types/src/dummy_type.cpp b/modules/types/src/dummy_type.cpp
@@ -8,8 +8,6 @@
 #include <iostream>
 #include <random>
 
-#include <magic_enum.hpp>
-
 #include "hephaestus/random/random_object_creator.h"
 #include "hephaestus/utils/format/format.h"
 
@@ -57,8 +55,8 @@ auto DummyType::random(std::mt19937_64& mt) -> DummyType {
 auto operator<<(std::ostream& os, const DummyType& dummy_type) -> std::ostream& {
   return os << "DummyType{\n"
             << "  dummy_primitives_type={" << dummy_type.dummy_primitives_type << "}\n"
-            << "  internal_dummy_enum=" << magic_enum::enum_name(dummy_type.internal_dummy_enum) << "\n"
-            << "  external_dummy_enum=" << magic_enum::enum_name(dummy_type.external_dummy_enum) << "\n"
+            << "  internal_dummy_enum=" << utils::format::toString(dummy_type.internal_dummy_enum) << "\n"
+            << "  external_dummy_enum=" << utils::format::toString(dummy_type.external_dummy_enum) << "\n"
             << "  dummy_string=" << dummy_type.dummy_string << "\n"
             << "  dummy_vector=" << utils::format::toString(dummy_type.dummy_vector) << "\n"
             << "}";