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

From Ryan Pavlik, "I have successfully compiled OpenSceneGraph trunk using the Clang compiler (using a recent trunk build of llvm and clang, haven't tested an older release). The attached files contain the change shown in the diff below, which was required to finish the build with Clang. It fixes an issue with two-phase name lookup - there's more information here http://blog.llvm.org/2009/12/dreaded-two-phase-name-lookup.html

Browse Source 
"
This commit is contained in:
Robert Osfield
2011-06-23 09:26:27 +00:00
parent 5ee864ff25
commit 8570c37ed5
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/osg/Array
View File

@@ -156,7 +156,7 @@ class TemplateArray : public Array, public MixinVector<T>
TemplateArray& operator = (const TemplateArray& array)
{
if (this==&array) return *this;
assign(array.begin(),array.end());
this->assign(array.begin(),array.end());
return *this;
}
@@ -242,7 +242,7 @@ class TemplateIndexArray : public IndexArray, public MixinVector<T>
TemplateIndexArray& operator = (const TemplateIndexArray& array)
{
if (this==&array) return *this;
assign(array.begin(),array.end());
this->assign(array.begin(),array.end());
return *this;
}

10
include/osgAnimation/Interpolator
View File

@@ -84,7 +84,7 @@ namespace osgAnimation
return;
}
int i = getKeyIndexFromTime(keyframes,time);
int i = this->getKeyIndexFromTime(keyframes,time);
result = keyframes[i].getValue();
}
};
@@ -110,7 +110,7 @@ namespace osgAnimation
return;
}
int i = getKeyIndexFromTime(keyframes,time);
int i = this->getKeyIndexFromTime(keyframes,time);
float blend = (time - keyframes[i].getTime()) / ( keyframes[i+1].getTime() - keyframes[i].getTime());
const TYPE& v1 = keyframes[i].getValue();
const TYPE& v2 = keyframes[i+1].getValue();
@@ -137,7 +137,7 @@ namespace osgAnimation
return;
}
int i = getKeyIndexFromTime(keyframes,time);
int i = this->getKeyIndexFromTime(keyframes,time);
float blend = (time - keyframes[i].getTime()) / ( keyframes[i+1].getTime() - keyframes[i].getTime());
const TYPE& q1 = keyframes[i].getValue();
const TYPE& q2 = keyframes[i+1].getValue();
@@ -165,7 +165,7 @@ namespace osgAnimation
return;
}
int i = getKeyIndexFromTime(keyframes,time);
int i = this->getKeyIndexFromTime(keyframes,time);
float blend = (time - keyframes[i].getTime()) / ( keyframes[i+1].getTime() - keyframes[i].getTime());
TYPE v1,v2;
keyframes[i].getValue().uncompress(keyframes.mScale, keyframes.mMin, v1);
@@ -196,7 +196,7 @@ namespace osgAnimation
return;
}
int i = getKeyIndexFromTime(keyframes,time);
int i = this->getKeyIndexFromTime(keyframes,time);
float t = (time - keyframes[i].getTime()) / ( keyframes[i+1].getTime() - keyframes[i].getTime());
float one_minus_t = 1.0-t;

2
src/osgPlugins/lwo/lwo2parser.h
View File

@@ -69,7 +69,7 @@ namespace lwo2
throw parser_error("invalid file format");
}
while (it < end)
chk->data.push_back(parse_chunk(it, "FORM"));
chk->data.push_back(this->parse_chunk(it, "FORM"));
return chk;
}
}