[Cmake-commits] CMake branch, next, updated. v3.2.1-1628-g575742d

[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  575742d4f928f7a9e2a1c17c38de4ff4cece4ea3 (commit)
       via  1daa60f24719894fa885bf0ce8b306f086c5b855 (commit)
      from  c80c588c16cfa8423bcaa63564b21ff0dc531939 (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=575742d4f928f7a9e2a1c17c38de4ff4cece4ea3
commit 575742d4f928f7a9e2a1c17c38de4ff4cece4ea3
Merge: c80c588 1daa60f
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Apr 8 12:43:03 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Apr 8 12:43:03 2015 -0400

    Merge topic 'refactor-cache-api' into next
    
    1daa60f2 Remove static string hack.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1daa60f24719894fa885bf0ce8b306f086c5b855
commit 1daa60f24719894fa885bf0ce8b306f086c5b855
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Apr 8 18:42:12 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Wed Apr 8 18:42:12 2015 +0200

    Remove static string hack.

diff --git a/Source/cmCacheManager.h b/Source/cmCacheManager.h
index a08006a..3b02fa6 100644
--- a/Source/cmCacheManager.h
+++ b/Source/cmCacheManager.h
@@ -65,7 +65,7 @@ public:
     void AppendProperty(const std::string& property, const char* value,
                         bool asString=false);
     void SetProperty(const std::string& property, bool value);
-    std::string GetValue() const { return this->GetEntry().Value; }
+    const char* GetValue() const { return this->GetEntry().Value.c_str(); }
     bool GetValueAsBool() const;
     void SetValue(const char*);
     CacheEntryType GetType() const { return this->GetEntry().Type; }
@@ -146,9 +146,7 @@ public:
       {
       return 0;
       }
-    static std::string value;
-    value = it.GetValue();
-    return value.c_str();
+    return it.GetValue();
   }
 
   const char* GetCacheEntryProperty(std::string const& key,

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

Summary of changes:
 Source/cmCacheManager.h |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake