[Cmake-commits] CMake branch, next, updated. v2.8.12.1-7245-g577db98

[Stephen Kelly]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  577db987158f1de69aad69735d1ba1397be45646 (commit)
       via  bb0622e2bc73918a061adde03409bbe4635fed1c (commit)
      from  ff5ebf91fe61099f486cf5d3b185655d57fe0c51 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=577db987158f1de69aad69735d1ba1397be45646
commit 577db987158f1de69aad69735d1ba1397be45646
Merge: ff5ebf9 bb0622e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Jan 22 10:35:12 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jan 22 10:35:12 2014 -0500

    Merge topic 'constify' into next
    
    bb0622e2 cmMakefile: Make ConfigureString const.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bb0622e2bc73918a061adde03409bbe4635fed1c
commit bb0622e2bc73918a061adde03409bbe4635fed1c
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Jan 22 16:33:56 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Jan 22 16:33:56 2014 +0100

    cmMakefile: Make ConfigureString const.

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;

-----------------------------------------------------------------------

Summary of changes:
 Source/cmMakefile.cxx |    2 +-
 Source/cmMakefile.h   |    6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake