mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-02-19 15:09:43 +00:00
Code Issues Releases Wiki Activity

Use a typedef to avoid conditional compiling

Browse source
This commit is contained in:
scrawl 2015-12-01 16:18:19 +01:00
parent c912310c52
commit c9d710f334
1 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
components/nifosg/controller.hpp
View file

@ -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