From c9d710f3340e19e3fb7260f6076ff33a53a3299a Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Tue, 1 Dec 2015 16:18:19 +0100
Subject: [PATCH] Use a typedef to avoid conditional compiling

---
 components/nifosg/controller.hpp | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/components/nifosg/controller.hpp b/components/nifosg/controller.hpp
index a8f52b4437..e1e969d066 100644
--- a/components/nifosg/controller.hpp
+++ b/components/nifosg/controller.hpp
@@ -47,16 +47,14 @@ namespace NifOsg
     class ValueInterpolator
     {
     public:
+        typedef typename MapT::ValueType ValueT;
+
         ValueInterpolator()
-            : mDefaultVal(typename MapT::ValueType())
+            : mDefaultVal(ValueT())
         {
         }
 
-#ifdef _MSC_VER
-        ValueInterpolator(boost::shared_ptr<const MapT> keys, typename MapT::ValueType defaultVal = MapT::ValueType())
-#else
-        ValueInterpolator(boost::shared_ptr<const MapT> keys, typename MapT::ValueType defaultVal = typename MapT::ValueType())
-#endif
+        ValueInterpolator(boost::shared_ptr<const MapT> keys, ValueT defaultVal = ValueT())
             : mKeys(keys)
             , mDefaultVal(defaultVal)
         {
@@ -67,7 +65,7 @@ namespace NifOsg
             }
         }
 
-        typename MapT::ValueType interpKey(float time) const
+        ValueT interpKey(float time) const
         {
             if (empty())
                 return mDefaultVal;
@@ -130,7 +128,7 @@ namespace NifOsg
 
         boost::shared_ptr<const MapT> mKeys;
 
-        typename MapT::ValueType mDefaultVal;
+        ValueT mDefaultVal;
     };
 
     struct LerpFunc