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

Move definition of SGRawBase<...>::printOn out of simgear namespace

Browse Source 
They are declared in the global namespace, and MSVC insists that they be
defined there.
This commit is contained in:
Tim Moore
2009-07-19 22:39:16 +02:00
parent 4943d3aa53
commit 1f308c9ec3
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
simgear/props/props.cxx
View File

@@ -2299,8 +2299,6 @@ SGPropertyChangeListener::unregister_property (SGPropertyNode * node)
_properties.erase(it);
}
namespace simgear
{
template<>
std::ostream& SGRawBase<SGVec3d>::printOn(std::ostream& stream) const
{
@@ -2314,6 +2312,8 @@ std::ostream& SGRawBase<SGVec3d>::printOn(std::ostream& stream) const
return stream;
}
namespace simgear
{
template<>
std::istream& readFrom<SGVec3d>(std::istream& stream, SGVec3d& result)
{
@@ -2322,7 +2322,7 @@ std::istream& readFrom<SGVec3d>(std::istream& stream, SGVec3d& result)
}
return stream;
}
}
template<>
std::ostream& SGRawBase<SGVec4d>::printOn(std::ostream& stream) const
{
@@ -2336,6 +2336,8 @@ std::ostream& SGRawBase<SGVec4d>::printOn(std::ostream& stream) const
return stream;
}
namespace simgear
{
template<>
std::istream& readFrom<SGVec4d>(std::istream& stream, SGVec4d& result)
{
@@ -2344,7 +2346,6 @@ std::istream& readFrom<SGVec4d>(std::istream& stream, SGVec4d& result)
}
return stream;
}
}
// end of props.cxx

1
simgear/scene/material/Effect.cxx
View File

@@ -415,6 +415,7 @@ void MaterialBuilder::buildAttribute(Effect* effect, Pass* pass,
if ((color = getEffectPropertyChild(effect, prop, "emissive-back")))
mat->setEmission(Material::BACK, getColor(color));
const SGPropertyNode* shininess = 0;
mat->setShininess(Material::FRONT_AND_BACK, 0.0f);
if ((shininess = getEffectPropertyChild(effect, prop, "shininess")))
mat->setShininess(Material::FRONT_AND_BACK, shininess->getFloatValue());
if ((shininess = getEffectPropertyChild(effect, prop, "shininess-front")))