archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Nathan Letwory's patch for bug #424 const errors kept MSVC7 projectfiles from compiling.

Browse Source
This commit is contained in:
Roel Spruit
2003-12-01 15:01:20 +00:00
parent b5e0a7b401
commit ffabbbea8d
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
source/gameengine/Expressions/Value.cpp
View File

@@ -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++)
{

2
source/gameengine/Expressions/Value.h
View File

@@ -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];