diff options
author | Roel Spruit <roel@spruitje.nl> | 2003-12-01 18:01:20 +0300 |
---|---|---|
committer | Roel Spruit <roel@spruitje.nl> | 2003-12-01 18:01:20 +0300 |
commit | ffabbbea8d8b1ce4eb0a435dc3036371c3af8b87 (patch) | |
tree | 512dec4af057b6184212b9ebff7a2f09b8225e18 /source/gameengine | |
parent | b5e0a7b401c47fb6b5a63a13792aab4b74efa3a2 (diff) |
Nathan Letwory's patch for bug #424 const errors kept MSVC7 projectfiles from compiling.
Diffstat (limited to 'source/gameengine')
-rw-r--r-- | source/gameengine/Expressions/Value.cpp | 10 | ||||
-rw-r--r-- | source/gameengine/Expressions/Value.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source/gameengine/Expressions/Value.cpp b/source/gameengine/Expressions/Value.cpp index 97b4f3951b3..ecbd2d9d6d8 100644 --- a/source/gameengine/Expressions/Value.cpp +++ b/source/gameengine/Expressions/Value.cpp @@ -284,7 +284,7 @@ void CValue::SetProperty(const STR_String & name,CValue* ioProperty) // Make sure we have a property array if (m_pNamedPropertyArray == NULL) - m_pNamedPropertyArray = new std::map<const STR_String,CValue *>; + m_pNamedPropertyArray = new std::map<STR_String,CValue *>; // Try to replace property (if so -> exit as soon as we replaced it) CValue* oldval = (*m_pNamedPropertyArray)[name]; @@ -308,7 +308,7 @@ CValue* CValue::GetProperty(const STR_String & inName) CValue* result = NULL; if (m_pNamedPropertyArray) { - std::map<const STR_String,CValue*>::iterator it = (*m_pNamedPropertyArray).find(inName); + std::map<STR_String,CValue*>::iterator it = (*m_pNamedPropertyArray).find(inName); if (!( it==m_pNamedPropertyArray->end())) { result = (*it).second; @@ -376,7 +376,7 @@ void CValue::ClearProperties() return; // Remove all properties - for ( std::map<const STR_String,CValue*>::iterator it = m_pNamedPropertyArray->begin(); + for ( std::map<STR_String,CValue*>::iterator it = m_pNamedPropertyArray->begin(); !(it == m_pNamedPropertyArray->end());it++) { CValue* tmpval = (*it).second; @@ -430,7 +430,7 @@ CValue* CValue::GetProperty(int inIndex) if (m_pNamedPropertyArray) { - for ( std::map<const STR_String,CValue*>::iterator it = m_pNamedPropertyArray->begin(); + for ( std::map<STR_String,CValue*>::iterator it = m_pNamedPropertyArray->begin(); !(it == m_pNamedPropertyArray->end());it++) { if (count++==inIndex) @@ -467,7 +467,7 @@ void CValue::CloneProperties(CValue *replica) if (m_pNamedPropertyArray) { replica->m_pNamedPropertyArray=NULL; - for ( std::map<const STR_String,CValue*>::iterator it = m_pNamedPropertyArray->begin(); + for ( std::map<STR_String,CValue*>::iterator it = m_pNamedPropertyArray->begin(); !(it == m_pNamedPropertyArray->end());it++) { diff --git a/source/gameengine/Expressions/Value.h b/source/gameengine/Expressions/Value.h index ba394814fa7..527dfa85d39 100644 --- a/source/gameengine/Expressions/Value.h +++ b/source/gameengine/Expressions/Value.h @@ -357,7 +357,7 @@ protected: virtual ~CValue(); private: // Member variables - std::map<const STR_String,CValue*>* m_pNamedPropertyArray; // Properties for user/game etc + std::map<STR_String,CValue*>* m_pNamedPropertyArray; // Properties for user/game etc ValueFlags m_ValFlags; // Frequently used flags in a bitfield (low memoryusage) int m_refcount; // Reference Counter static double m_sZeroVec[3]; |