From 6b301006112d8ab5732417c9bf0dfb3f6b1a1ca9 Mon Sep 17 00:00:00 2001
From: Robbert van der Helm <mail@robbertvanderhelm.nl>
Date: Mon, 9 Mar 2020 12:39:06 +0100
Subject: [PATCH] Move the derived bitsery extension to bitsery::ext

To make it easier to move it over later and to make the implementation
slightly less verbose.
---
 src/common/bitsery.h | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/common/bitsery.h b/src/common/bitsery.h
index aeab6d68..15c9abed 100644
--- a/src/common/bitsery.h
+++ b/src/common/bitsery.h
@@ -24,27 +24,37 @@
 
 // TODO: Implement
 
+namespace bitsery {
+namespace ext {
 template <template <typename> class TPtrManager,
           template <typename>
           class TPolymorphicContext,
           typename RTTI>
 class MultiplePointerObjectExtensionBase
-    : public bitsery::ext::pointer_utils::
-          PointerObjectExtensionBase<TPtrManager, TPolymorphicContext, RTTI> {};
+    : public pointer_utils::
+          PointerObjectExtensionBase<TPtrManager, TPolymorphicContext, RTTI> {
+    // explicit PointerObjectExtensionBase(
+    //     PointerType ptrType = PointerType::Nullable,
+    //     MemResourceBase* resource = nullptr,
+    //     bool resourcePropagate = false)
+    //     : _ptrType{ptrType},
+    //       _resourcePropagate{resourcePropagate},
+    //       _resource{resource} {}
+};
 
 template <typename RTTI>
-using MultiplePointerOwnerBase = MultiplePointerObjectExtensionBase<
-    bitsery::ext::pointer_details::PtrOwnerManager,
-    bitsery::ext::PolymorphicContext,
-    RTTI>;
+using MultiplePointerOwnerBase =
+    MultiplePointerObjectExtensionBase<pointer_details::PtrOwnerManager,
+                                       PolymorphicContext,
+                                       RTTI>;
 
-using MultiplePointerOwner =
-    MultiplePointerOwnerBase<bitsery::ext::StandardRTTI>;
+using MultiplePointerOwner = MultiplePointerOwnerBase<StandardRTTI>;
+
+}  // namespace ext
 
-namespace bitsery {
 namespace traits {
 template <typename T, typename RTTI>
-struct ExtensionTraits<::MultiplePointerOwnerBase<RTTI>, T*> {
+struct ExtensionTraits<ext::MultiplePointerOwnerBase<RTTI>, T*> {
     using TValue = T;
     static constexpr bool SupportValueOverload = true;
     static constexpr bool SupportObjectOverload = true;