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

- fbx: change const semantics for PropertyTable's. Lazy parsing of properties no longer affects logical constness.

pull/14/head
acgessler 2012-07-02 17:09:32 +02:00
parent 97e1761ecd
commit b49cf16bc2
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
code/FBXProperties.cpp
View File

@ -120,7 +120,7 @@ std::string PeekPropertyName(const Element& element)
} //! anon } //! anon
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
PropertyTable::PropertyTable(const Element& element, PropertyTable* templateProps) PropertyTable::PropertyTable(const Element& element, const PropertyTable* templateProps)
: element(element) : element(element)
, templateProps(templateProps) , templateProps(templateProps)
{ {
@ -156,7 +156,7 @@ PropertyTable::~PropertyTable()
} }
// ------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------
const Property* PropertyTable::Get(const std::string& name) const Property* PropertyTable::Get(const std::string& name) const
{ {
PropertyMap::const_iterator it = props.find(name); PropertyMap::const_iterator it = props.find(name);
if (it == props.end()) { if (it == props.end()) {

8
code/FBXProperties.h
View File

@ -109,12 +109,12 @@ class PropertyTable
{ {
public: public:
PropertyTable(const Element& element, PropertyTable* templateProps); PropertyTable(const Element& element, const PropertyTable* templateProps);
~PropertyTable(); ~PropertyTable();
public: public:
const Property* Get(const std::string& name); const Property* Get(const std::string& name) const;
const Element& GetElement() const { const Element& GetElement() const {
return element; return element;
@ -127,8 +127,8 @@ public:
private: private:
LazyPropertyMap lazyProps; LazyPropertyMap lazyProps;
PropertyMap props; mutable PropertyMap props;
PropertyTable* const templateProps; const PropertyTable* const templateProps;
const Element& element; const Element& element;
}; };