From 54c573fb229f89c4b0d8a85eedf386d1f8a8a641 Mon Sep 17 00:00:00 2001
From: Kp <kp@valhallalegends.com>
Date: Fri, 30 Jun 2017 04:09:26 +0000
Subject: [PATCH] Adjust valptridx auto-instantiate for -O2 -fno-inline

---
 similar/main/mglobal.cpp | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/similar/main/mglobal.cpp b/similar/main/mglobal.cpp
index 52c372c8a..4e4a9c75a 100644
--- a/similar/main/mglobal.cpp
+++ b/similar/main/mglobal.cpp
@@ -104,19 +104,19 @@ valptridx<wall>::array_managed_type Walls;
 
 /*
  * 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.
+ * the compiler inliner is not enabled.  This is required because
+ * non-inline 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.
+ * Force full instantiation for non-inline builds so that these
+ * references are satisfied.  For inline-enabled builds, instantiate
+ * only the classes that are known to be used.
  */
 #ifndef DXX_VALPTRIDX_ENABLE_FULL_TEMPLATE_INSTANTIATION
-#if (defined(__OPTIMIZE__) && __OPTIMIZE__ > 0)
-#define DXX_VALPTRIDX_ENABLE_FULL_TEMPLATE_INSTANTIATION	0
-#else
+#if (defined(__NO_INLINE__) && __NO_INLINE__ > 0)
 #define DXX_VALPTRIDX_ENABLE_FULL_TEMPLATE_INSTANTIATION	1
+#else
+#define DXX_VALPTRIDX_ENABLE_FULL_TEMPLATE_INSTANTIATION	0
 #endif
 #endif