v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed a compile error due to a >> expression in a nested template statement.

pull/231/head
Frederik Aalund 2014-03-09 17:04:27 +01:00
parent 9eb8677aba
commit f65e5d5487
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
code/FBXConverter.cpp
View File

@ -782,17 +782,17 @@ private:
bool parse_succeeded = false; bool parse_succeeded = false;
// Interpret the property as a concrete type // Interpret the property as a concrete type
if (const TypedProperty<std::string>* interpreted = prop.second->As<TypedProperty<std::string>>()) if (const TypedProperty<std::string>* interpreted = prop.second->As<TypedProperty<std::string> >())
ss << interpreted->Value(); ss << interpreted->Value();
else if (const TypedProperty<bool>* interpreted = prop.second->As<TypedProperty<bool>>()) else if (const TypedProperty<bool>* interpreted = prop.second->As<TypedProperty<bool> >())
ss << interpreted->Value(); ss << interpreted->Value();
else if (const TypedProperty<int>* interpreted = prop.second->As<TypedProperty<int>>()) else if (const TypedProperty<int>* interpreted = prop.second->As<TypedProperty<int> >())
ss << interpreted->Value(); ss << interpreted->Value();
else if (const TypedProperty<uint64_t>* interpreted = prop.second->As<TypedProperty<uint64_t>>()) else if (const TypedProperty<uint64_t>* interpreted = prop.second->As<TypedProperty<uint64_t> >())
ss << interpreted->Value(); ss << interpreted->Value();
else if (const TypedProperty<float>* interpreted = prop.second->As<TypedProperty<float>>()) else if (const TypedProperty<float>* interpreted = prop.second->As<TypedProperty<float> >())
ss << interpreted->Value(); ss << interpreted->Value();
else if (const TypedProperty<aiVector3D>* interpreted = prop.second->As<TypedProperty<aiVector3D>>()) else if (const TypedProperty<aiVector3D>* interpreted = prop.second->As<TypedProperty<aiVector3D> >())
{ {
aiVector3D v = interpreted->Value(); aiVector3D v = interpreted->Value();
ss << v.x << ";" << v.y << ";" << v.z; ss << v.x << ";" << v.y << ";" << v.z;

2
code/FBXProperties.h
View File

@ -101,7 +101,7 @@ private:
}; };
typedef std::fbx_unordered_map<std::string,boost::shared_ptr<Property>> DirectPropertyMap; typedef std::fbx_unordered_map<std::string,boost::shared_ptr<Property> > DirectPropertyMap;
typedef std::fbx_unordered_map<std::string,const Property*> PropertyMap; typedef std::fbx_unordered_map<std::string,const Property*> PropertyMap;
typedef std::fbx_unordered_map<std::string,const Element*> LazyPropertyMap; typedef std::fbx_unordered_map<std::string,const Element*> LazyPropertyMap;