summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Kelly <steveire@gmail.com>2014-01-22 15:33:56 (GMT)
committerStephen Kelly <steveire@gmail.com>2014-01-22 20:28:42 (GMT)
commitbde0dab15d6bdefeadd329a67dbe53812d9f3254 (patch)
treecb222b32ae0d9d6d495d08847d995fa799beeefb
parentbf1e1bf1d0a8a966af0c8e454d0bc11b5ed874e1 (diff)
downloadCMake-bde0dab15d6bdefeadd329a67dbe53812d9f3254.zip
CMake-bde0dab15d6bdefeadd329a67dbe53812d9f3254.tar.gz
CMake-bde0dab15d6bdefeadd329a67dbe53812d9f3254.tar.bz2
cmMakefile: Make ConfigureString const.
-rw-r--r--Source/cmMakefile.cxx2
-rw-r--r--Source/cmMakefile.h6
2 files changed, 4 insertions, 4 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index fa8918e..55a9d5c 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -3371,7 +3371,7 @@ std::string cmMakefile::GetModulesFile(const char* filename) const
void cmMakefile::ConfigureString(const std::string& input,
std::string& output, bool atOnly,
- bool escapeQuotes)
+ bool escapeQuotes) const
{
// Split input to handle one line at a time.
std::string::const_iterator lineStart = input.begin();
diff --git a/Source/cmMakefile.h b/Source/cmMakefile.h
index dac3dfb..66a33bb 100644
--- a/Source/cmMakefile.h
+++ b/Source/cmMakefile.h
@@ -692,7 +692,7 @@ public:
* See cmConfigureFileCommand for details.
*/
void ConfigureString(const std::string& input, std::string& output,
- bool atOnly, bool escapeQuotes);
+ bool atOnly, bool escapeQuotes) const;
/**
* Copy file but change lines acording to ConfigureString
@@ -968,8 +968,8 @@ private:
std::map<cmStdString, bool> SubDirectoryOrder;
- cmsys::RegularExpression cmDefineRegex;
- cmsys::RegularExpression cmDefine01Regex;
+ mutable cmsys::RegularExpression cmDefineRegex;
+ mutable cmsys::RegularExpression cmDefine01Regex;
mutable cmsys::RegularExpression cmAtVarRegex;
cmPropertyMap Properties;