Move serialization detournavigator/ -> components/

apps/openmw_test_suite/CMakeLists.txt

@@ -41,10 +41,11 @@ if (GTEST_FOUND AND GMOCK_FOUND)
         detournavigator/recastmeshobject.cpp
         detournavigator/navmeshtilescache.cpp
         detournavigator/tilecachedrecastmeshmanager.cpp
-        detournavigator/serialization/binaryreader.cpp
+
-        detournavigator/serialization/binarywriter.cpp
+        serialization/binaryreader.cpp
-        detournavigator/serialization/sizeaccumulator.cpp
+        serialization/binarywriter.cpp
-        detournavigator/serialization/integration.cpp
+        serialization/sizeaccumulator.cpp
+        serialization/integration.cpp
 
         settings/parser.cpp
 

apps/openmw_test_suite/serialization/binaryreader.cpp

@@ -1,6 +1,6 @@
 #include "format.hpp"
 
-#include <components/detournavigator/serialization/binaryreader.hpp>
+#include <components/serialization/binaryreader.hpp>
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
@@ -12,8 +12,8 @@
 namespace
 {
     using namespace testing;
-    using namespace DetourNavigator::Serialization;
+    using namespace Serialization;
-    using namespace DetourNavigator::SerializationTesting;
+    using namespace SerializationTesting;
 
     TEST(DetourNavigatorSerializationBinaryReaderTest, shouldReadArithmeticTypeValue)
     {

apps/openmw_test_suite/serialization/binarywriter.cpp

@@ -1,6 +1,6 @@
 #include "format.hpp"
 
-#include <components/detournavigator/serialization/binarywriter.hpp>
+#include <components/serialization/binarywriter.hpp>
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
@@ -12,8 +12,8 @@
 namespace
 {
     using namespace testing;
-    using namespace DetourNavigator::Serialization;
+    using namespace Serialization;
-    using namespace DetourNavigator::SerializationTesting;
+    using namespace SerializationTesting;
 
     TEST(DetourNavigatorSerializationBinaryWriterTest, shouldWriteArithmeticTypeValue)
     {

apps/openmw_test_suite/serialization/format.hpp

@@ -1,12 +1,12 @@
-#ifndef OPENMW_TEST_SUITE_DETOURNAVIGATOR_SERIALIZATION_FORMAT_H
+#ifndef OPENMW_TEST_SUITE_SERIALIZATION_FORMAT_H
-#define OPENMW_TEST_SUITE_DETOURNAVIGATOR_SERIALIZATION_FORMAT_H
+#define OPENMW_TEST_SUITE_SERIALIZATION_FORMAT_H
 
-#include <components/detournavigator/serialization/format.hpp>
+#include <components/serialization/format.hpp>
 
 #include <utility>
 #include <type_traits>
 
-namespace DetourNavigator::SerializationTesting
+namespace SerializationTesting
 {
     struct Pod
     {

apps/openmw_test_suite/serialization/integration.cpp

@@ -1,8 +1,8 @@
 #include "format.hpp"
 
-#include <components/detournavigator/serialization/sizeaccumulator.hpp>
+#include <components/serialization/sizeaccumulator.hpp>
-#include <components/detournavigator/serialization/binarywriter.hpp>
+#include <components/serialization/binarywriter.hpp>
-#include <components/detournavigator/serialization/binaryreader.hpp>
+#include <components/serialization/binaryreader.hpp>
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
@@ -12,8 +12,8 @@
 namespace
 {
     using namespace testing;
-    using namespace DetourNavigator::Serialization;
+    using namespace Serialization;
-    using namespace DetourNavigator::SerializationTesting;
+    using namespace SerializationTesting;
 
     struct DetourNavigatorSerializationIntegrationTest : Test
     {

apps/openmw_test_suite/serialization/sizeaccumulator.cpp

@@ -1,6 +1,6 @@
 #include "format.hpp"
 
-#include <components/detournavigator/serialization/sizeaccumulator.hpp>
+#include <components/serialization/sizeaccumulator.hpp>
 
 #include <gtest/gtest.h>
 
@@ -12,8 +12,8 @@
 namespace
 {
     using namespace testing;
-    using namespace DetourNavigator::Serialization;
+    using namespace Serialization;
-    using namespace DetourNavigator::SerializationTesting;
+    using namespace SerializationTesting;
 
     TEST(DetourNavigatorSerializationSizeAccumulatorTest, shouldProvideSizeForArithmeticType)
     {

components/serialization/binaryreader.hpp

@@ -1,5 +1,5 @@
-#ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_SERIALIZATION_BINARYREADER_H
+#ifndef OPENMW_COMPONENTS_SERIALIZATION_BINARYREADER_H
-#define OPENMW_COMPONENTS_DETOURNAVIGATOR_SERIALIZATION_BINARYREADER_H
+#define OPENMW_COMPONENTS_SERIALIZATION_BINARYREADER_H
 
 #include <cassert>
 #include <cstddef>
@@ -7,7 +7,7 @@
 #include <stdexcept>
 #include <type_traits>
 
-namespace DetourNavigator::Serialization
+namespace Serialization
 {
     class BinaryReader
     {

components/serialization/binarywriter.hpp

@@ -1,5 +1,5 @@
-#ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_SERIALIZATION_BINARYWRITER_H
+#ifndef OPENMW_COMPONENTS_SERIALIZATION_BINARYWRITER_H
-#define OPENMW_COMPONENTS_DETOURNAVIGATOR_SERIALIZATION_BINARYWRITER_H
+#define OPENMW_COMPONENTS_SERIALIZATION_BINARYWRITER_H
 
 #include <cassert>
 #include <cstddef>
@@ -7,7 +7,7 @@
 #include <stdexcept>
 #include <type_traits>
 
-namespace DetourNavigator::Serialization
+namespace Serialization
 {
     struct BinaryWriter
     {

components/serialization/format.hpp

@@ -1,5 +1,5 @@
-#ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_SERIALIZATION_FORMAT_H
+#ifndef OPENMW_COMPONENTS_SERIALIZATION_FORMAT_H
-#define OPENMW_COMPONENTS_DETOURNAVIGATOR_SERIALIZATION_FORMAT_H
+#define OPENMW_COMPONENTS_SERIALIZATION_FORMAT_H
 
 #include <algorithm>
 #include <cstddef>
@@ -8,7 +8,7 @@
 #include <utility>
 #include <vector>
 
-namespace DetourNavigator::Serialization
+namespace Serialization
 {
     enum class Mode
     {
@@ -22,6 +22,9 @@ namespace DetourNavigator::Serialization
     template <class ... Args>
     struct IsContiguousContainer<std::vector<Args ...>> : std::true_type {};
 
+    template <class T, std::size_t n>
+    struct IsContiguousContainer<std::array<T, n>> : std::true_type {};
+
     template <class T>
     constexpr bool isContiguousContainer = IsContiguousContainer<std::decay_t<T>>::value;
 

components/serialization/sizeaccumulator.hpp

@@ -1,10 +1,10 @@
-#ifndef OPENMW_COMPONENTS_DETOURNAVIGATOR_SERIALIZATION_SIZEACCUMULATOR_H
+#ifndef OPENMW_COMPONENTS_SERIALIZATION_SIZEACCUMULATOR_H
-#define OPENMW_COMPONENTS_DETOURNAVIGATOR_SERIALIZATION_SIZEACCUMULATOR_H
+#define OPENMW_COMPONENTS_SERIALIZATION_SIZEACCUMULATOR_H
 
 #include <cstddef>
 #include <type_traits>
 
-namespace DetourNavigator::Serialization
+namespace Serialization
 {
     class SizeAccumulator
     {