FGFS-4.1/simgear
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make dependent template lookups explicit.

Browse Source 
Clang (in Xcode 4.4) is being strict about dependent lookup rules, so apply the recommended fix-it.
This commit is contained in:
James Turner 2012-07-31 00:57:09 +01:00
parent f71f129e3b
commit e288549c9e
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
simgear/props/ExtendedPropertyAdapter.hxx
View File

@ -46,7 +46,7 @@ public:
if (_elements.size() < num_components) if (_elements.size() < num_components)
throw sg_exception(); throw sg_exception();
for (int i = 0; i < num_components; ++i) for (int i = 0; i < num_components; ++i)
result[i] = _elements[i]->getValue<double>(); result[i] = _elements[i]->template getValue<double>();
return result; return result;
} }
void set(const T& val) void set(const T& val)

2
simgear/props/propertyObject.hxx
View File

@ -108,7 +108,7 @@ public:
// conversion operators // conversion operators
operator T () const operator T () const
{ {
return getOrThrow()->getValue<T>(); return getOrThrow()->template getValue<T>();
} }
T operator=(const T& aValue) T operator=(const T& aValue)

8
simgear/scene/material/EffectBuilder.hxx
View File

@ -195,7 +195,7 @@ void findAttr(const effect::EffectPropertyMap<T>& pMap,
{ {
using namespace effect; using namespace effect;
typename EffectPropertyMap<T>::BMap::iterator itr typename EffectPropertyMap<T>::BMap::iterator itr
= pMap._map.get<from>().find(name); = pMap._map.template get<from>().find(name);
if (itr == pMap._map.end()) { if (itr == pMap._map.end()) {
throw effect::BuilderException(string("findAttr: could not find attribute ") throw effect::BuilderException(string("findAttr: could not find attribute ")
+ string(name)); + string(name));
@ -233,7 +233,7 @@ const T* findAttr(const effect::EffectPropertyMap<T>& pMap,
{ {
using namespace effect; using namespace effect;
typename EffectPropertyMap<T>::BMap::iterator itr typename EffectPropertyMap<T>::BMap::iterator itr
= pMap._map.get<from>().find(name); = pMap._map.template get<from>().find(name);
if (itr == pMap._map.end()) if (itr == pMap._map.end())
return 0; return 0;
else else
@ -267,8 +267,8 @@ std::string findName(const effect::EffectPropertyMap<T>& pMap, T value)
using namespace effect; using namespace effect;
std::string result; std::string result;
typename EffectPropertyMap<T>::BMap::template index_iterator<to>::type itr typename EffectPropertyMap<T>::BMap::template index_iterator<to>::type itr
= pMap._map.get<to>().find(value); = pMap._map.template get<to>().find(value);
if (itr != pMap._map.get<to>().end()) if (itr != pMap._map.template get<to>().end())
result = itr->first; result = itr->first;
return result; return result;
} }