Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 17:34:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix weird bug in Project::ResolveProperties(), which was modifying the string given in argument

Browse source 
svn path=/trunk/; revision=29104
This commit is contained in:
Hervé Poussineau 2007-09-19 12:06:39 +00:00
parent a756421600
commit a7a5e5a486
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
reactos/tools/rbuild/project.cpp
View file

@ -196,7 +196,7 @@ Project::LookupProperty ( const string& name ) const
} }
string string
Project::ResolveNextProperty ( string& s ) const Project::ResolveNextProperty ( const string& s ) const
{ {
size_t i = s.find ( "${" ); size_t i = s.find ( "${" );
if ( i == string::npos ) if ( i == string::npos )
@ -215,7 +215,7 @@ Project::ResolveNextProperty ( string& s ) const
string propertyName = s.substr ( i + 2, propertyNameLength ); string propertyName = s.substr ( i + 2, propertyNameLength );
const Property* property = LookupProperty ( propertyName ); const Property* property = LookupProperty ( propertyName );
if ( property != NULL ) if ( property != NULL )
return s.replace ( i, propertyNameLength + 3, property->value ); return string ( s ).replace ( i, propertyNameLength + 3, property->value );
} }
} }
return s; return s;

2
reactos/tools/rbuild/rbuild.h
View file

@ -251,7 +251,7 @@ public:
const std::string& GetProjectFilename () const; const std::string& GetProjectFilename () const;
std::string ResolveProperties ( const std::string& s ) const; std::string ResolveProperties ( const std::string& s ) const;
private: private:
std::string ResolveNextProperty ( std::string& s ) const; std::string ResolveNextProperty ( const std::string& s ) const;
const Property* LookupProperty ( const std::string& name ) const; const Property* LookupProperty ( const std::string& name ) const;
void SetConfigurationOption ( char* s, void SetConfigurationOption ( char* s,
std::string name, std::string name,