From e4ce907c1ddda79861aedf2200e74a6c89c64f74 Mon Sep 17 00:00:00 2001
From: Kp <kp@valhallalegends.com>
Date: Wed, 7 Jun 2017 02:44:54 +0000
Subject: [PATCH] Reduce scope of explicit instantiations

---
 similar/main/mglobal.cpp | 51 ++++++++++++++++++++++++++++++++++------
 1 file changed, 44 insertions(+), 7 deletions(-)

diff --git a/similar/main/mglobal.cpp b/similar/main/mglobal.cpp
index bf93bf9aa..7f65a6da1 100644
--- a/similar/main/mglobal.cpp
+++ b/similar/main/mglobal.cpp
@@ -102,11 +102,48 @@ valptridx<trigger>::array_managed_type Triggers;
 valptridx<wall>::array_managed_type Walls;
 }
 
-template class valptridx<active_door>;
-#if defined(DXX_BUILD_DESCENT_II)
-template class valptridx<cloaking_wall>;
+/*
+ * If not specified otherwise by the user, enable full instantiation if
+ * the compiler optimizer is not enabled.  This is required because
+ * non-optimized builds contain link time references to functions that
+ * are not used.
+ *
+ * Force full instantiation for non-optimized builds so that these
+ * references are satisfied.  For optimized builds, instantiate only the
+ * classes that are known to be used.
+ */
+#ifndef DXX_VALPTRIDX_ENABLE_FULL_TEMPLATE_INSTANTIATION
+#define DXX_VALPTRIDX_ENABLE_FULL_TEMPLATE_INSTANTIATION	!(defined(__OPTIMIZE__) && __OPTIMIZE__ > 0)
+#endif
+
+#if DXX_VALPTRIDX_ENABLE_FULL_TEMPLATE_INSTANTIATION
+template class valptridx<dcx::active_door>;
+#if defined(DXX_BUILD_DESCENT_II)
+template class valptridx<dsx::cloaking_wall>;
+#endif
+template class valptridx<dsx::object>;
+template class valptridx<dsx::segment>;
+template class valptridx<dsx::trigger>;
+template class valptridx<dsx::wall>;
+
+#else
+
+#if DXX_VALPTRIDX_REPORT_ERROR_STYLE == DXX_VALPTRIDX_ERROR_STYLE_TREAT_AS_EXCEPTION
+template class valptridx<dcx::active_door>::index_range_exception;
+#if defined(DXX_BUILD_DESCENT_II)
+template class valptridx<dsx::cloaking_wall>::index_range_exception;
+#endif
+
+template class valptridx<dsx::object>::index_mismatch_exception;
+template class valptridx<dsx::object>::index_range_exception;
+template class valptridx<dsx::object>::null_pointer_exception;
+
+template class valptridx<dsx::segment>::index_mismatch_exception;
+template class valptridx<dsx::segment>::index_range_exception;
+template class valptridx<dsx::segment>::null_pointer_exception;
+
+template class valptridx<dsx::trigger>::index_range_exception;
+template class valptridx<dsx::wall>::index_range_exception;
+#endif
+
 #endif
-template class valptridx<object>;
-template class valptridx<segment>;
-template class valptridx<trigger>;
-template class valptridx<wall>;