Make dependent template lookups explicit.

Clang (in Xcode 4.4) is being strict about dependent lookup rules, so apply the recommended fix-it.

diff --git a/simgear/props/ExtendedPropertyAdapter.hxx b/simgear/props/ExtendedPropertyAdapter.hxx
index 064f407491005e075932f2297213d70f6fac8bf1..cbe50760e301228914a3afcd3c4b457fbbd73641 100644 (file)
--- a/simgear/props/ExtendedPropertyAdapter.hxx
+++ b/simgear/props/ExtendedPropertyAdapter.hxx
@@ -46,7 +46,7 @@ public:
         if (_elements.size() < num_components)
             throw sg_exception();
         for (int i = 0; i < num_components; ++i)
-            result[i] = _elements[i]->getValue<double>();
+            result[i] = _elements[i]->template getValue<double>();
         return result;
     }
     void set(const T& val)

diff --git a/simgear/props/propertyObject.hxx b/simgear/props/propertyObject.hxx
index a6d357f89d817ea40f07027a23f5d884b5503213..33c30a4580c4809ead8206e916e2f4e9d89dac3a 100644 (file)
--- a/simgear/props/propertyObject.hxx
+++ b/simgear/props/propertyObject.hxx
@@ -108,7 +108,7 @@ public:
 // conversion operators
   operator T () const
   {
-    return getOrThrow()->getValue<T>();
+    return getOrThrow()->template getValue<T>();
   }
 
   T operator=(const T& aValue)

diff --git a/simgear/scene/material/EffectBuilder.hxx b/simgear/scene/material/EffectBuilder.hxx
index c9b49e3d986956bf2653d6e37a003e33214e3db6..3447024f1b564f8f2abbbb2581f1c0af5246ca6b 100644 (file)
--- a/simgear/scene/material/EffectBuilder.hxx
+++ b/simgear/scene/material/EffectBuilder.hxx
@@ -195,7 +195,7 @@ void findAttr(const effect::EffectPropertyMap<T>& pMap,
 {
     using namespace effect;
     typename EffectPropertyMap<T>::BMap::iterator itr
-        = pMap._map.get<from>().find(name);
+        = pMap._map.template get<from>().find(name);
     if (itr == pMap._map.end()) {
         throw effect::BuilderException(string("findAttr: could not find attribute ")
                                + string(name));
@@ -233,7 +233,7 @@ const T* findAttr(const effect::EffectPropertyMap<T>& pMap,
 {
     using namespace effect;
     typename EffectPropertyMap<T>::BMap::iterator itr
-        = pMap._map.get<from>().find(name);
+        = pMap._map.template get<from>().find(name);
     if (itr == pMap._map.end())
         return 0;
     else 
@@ -267,8 +267,8 @@ std::string findName(const effect::EffectPropertyMap<T>& pMap, T value)
     using namespace effect;
     std::string result;
     typename EffectPropertyMap<T>::BMap::template index_iterator<to>::type itr
-        = pMap._map.get<to>().find(value);
-    if (itr != pMap._map.get<to>().end())
+        = pMap._map.template get<to>().find(value);
+    if (itr != pMap._map.template get<to>().end())
         result = itr->first;
     return result;
 }