[Cmake-commits] CMake branch, next, updated. v3.2.2-2409-gf90f8e3

Stephen Kelly steveire at gmail.com
Fri May 1 13:48:14 EDT 2015


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  f90f8e3476dc20851df186508314a681558ecf04 (commit)
       via  e4a3b3e6230a000e30b9daa94f5141ff56154178 (commit)
      from  6600cd57f3a6035169ff132a6ab725b606168657 (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=f90f8e3476dc20851df186508314a681558ecf04
commit f90f8e3476dc20851df186508314a681558ecf04
Merge: 6600cd5 e4a3b3e
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri May 1 13:48:14 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri May 1 13:48:14 2015 -0400

    Merge topic 'refactor-cmDefinitions-Get' into next
    
    e4a3b3e6 Reorder methods to reduce diff noise.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e4a3b3e6230a000e30b9daa94f5141ff56154178
commit e4a3b3e6230a000e30b9daa94f5141ff56154178
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Fri May 1 19:47:27 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Fri May 1 19:47:27 2015 +0200

    Reorder methods to reduce diff noise.

diff --git a/Source/cmDefinitions.cxx b/Source/cmDefinitions.cxx
index c42d060..f54bc4d 100644
--- a/Source/cmDefinitions.cxx
+++ b/Source/cmDefinitions.cxx
@@ -17,15 +17,6 @@
 cmDefinitions::Def cmDefinitions::NoDef;
 
 //----------------------------------------------------------------------------
-const char* cmDefinitions::Get(const std::string& key,
-    std::list<cmDefinitions>::reverse_iterator rbegin,
-    std::list<cmDefinitions>::reverse_iterator rend)
-{
-  Def const& def = cmDefinitions::GetInternal(key, rbegin, rend);
-  return def.Exists? def.c_str() : 0;
-}
-
-//----------------------------------------------------------------------------
 cmDefinitions::Def const& cmDefinitions::GetInternal(
   const std::string& key,
   std::list<cmDefinitions>::reverse_iterator rbegin,
@@ -48,6 +39,15 @@ cmDefinitions::Def const& cmDefinitions::GetInternal(
 }
 
 //----------------------------------------------------------------------------
+const char* cmDefinitions::Get(const std::string& key,
+    std::list<cmDefinitions>::reverse_iterator rbegin,
+    std::list<cmDefinitions>::reverse_iterator rend)
+{
+  Def const& def = cmDefinitions::GetInternal(key, rbegin, rend);
+  return def.Exists? def.c_str() : 0;
+}
+
+//----------------------------------------------------------------------------
 void cmDefinitions::Set(const std::string& key, const char* value)
 {
   Def def(value);

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

Summary of changes:
 Source/cmDefinitions.cxx |   18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list