From 47f1e1515aa81f534e9eed47b4a7e7c0bac79bc6 Mon Sep 17 00:00:00 2001
From: Kp <kp@valhallalegends.com>
Date: Fri, 11 Aug 2017 23:43:53 +0000
Subject: [PATCH] Move valptridx array typedef to appear earlier

---
 common/include/fwd-valptridx.h | 1 +
 common/include/valptridx.h     | 1 -
 common/main/fwd-object.h       | 6 +-----
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/common/include/fwd-valptridx.h b/common/include/fwd-valptridx.h
index b587594b6..e3e363562 100644
--- a/common/include/fwd-valptridx.h
+++ b/common/include/fwd-valptridx.h
@@ -182,4 +182,5 @@ public:
 	using IVPREFIX ## MCPREFIX ## DERIVED_TYPE_PREFIX ## PISUFFIX ## _t = valptridx<MANAGED_TYPE>::IVPREFIX ## MCPREFIX ## PISUFFIX
 
 #define DXX_VALPTRIDX_DEFINE_SUBTYPE_TYPEDEFS(MANAGED_TYPE, DERIVED_TYPE_PREFIX)	\
+	using MANAGED_TYPE ## _array = valptridx<MANAGED_TYPE>::array_managed_type;	\
 	DXX_VALPTRIDX_FOR_EACH_IPPI_TYPE(DXX_VALPTRIDX_DEFINE_SUBTYPE_TYPEDEF, MANAGED_TYPE, DERIVED_TYPE_PREFIX,)
diff --git a/common/include/valptridx.h b/common/include/valptridx.h
index 58f91aeb3..1d33252f9 100644
--- a/common/include/valptridx.h
+++ b/common/include/valptridx.h
@@ -1067,7 +1067,6 @@ public:
 	DXX_VALPTRIDX_DEFINE_FACTORY(MANAGED_TYPE, IVPREFIX ## MCPREFIX ## DERIVED_TYPE_PREFIX ## PISUFFIX, GLOBAL_ARRAY, IVPREFIX ## MCPREFIX ## PISUFFIX)
 
 #define DXX_VALPTRIDX_DEFINE_GLOBAL_FACTORIES(MANAGED_TYPE,DERIVED_TYPE_PREFIX,GLOBAL_ARRAY)	\
-	using MANAGED_TYPE ## _array = valptridx<MANAGED_TYPE>::array_managed_type;	\
 	extern MANAGED_TYPE ## _array GLOBAL_ARRAY;	\
 	namespace { namespace {	\
 	DXX_VALPTRIDX_FOR_EACH_PPI_TYPE(DXX_VALPTRIDX_DEFINE_GLOBAL_FACTORY, MANAGED_TYPE, DERIVED_TYPE_PREFIX, GLOBAL_ARRAY);	\
diff --git a/common/main/fwd-object.h b/common/main/fwd-object.h
index 976764287..a6fe0e301 100644
--- a/common/main/fwd-object.h
+++ b/common/main/fwd-object.h
@@ -13,10 +13,10 @@
 #include "dsx-ns.h"
 #include "compiler-array.h"
 #include "objnum.h"
-#include "cpp-valptridx.h"
 #include "fwd-vecmat.h"
 #include "fwd-segment.h"
 #include "fwd-window.h"
+#include "fwd-valptridx.h"
 
 struct bitmap_index;
 
@@ -34,11 +34,7 @@ namespace dsx {
 struct object;
 }
 DXX_VALPTRIDX_DECLARE_SUBTYPE(dsx::, object, objnum_t, MAX_OBJECTS);
-#endif
 
-#include "fwd-valptridx.h"
-
-#ifdef dsx
 namespace dsx {
 DXX_VALPTRIDX_DEFINE_SUBTYPE_TYPEDEFS(object, obj);