[Cmake-commits] CMake branch, next, updated. v3.2.2-2537-g732ff02

Stephen Kelly steveire at gmail.com
Tue May 5 16:11:42 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  732ff0246956634b57c230beb89e24a3e5772de5 (commit)
       via  9f6f51794a94e8f3923f0a29c334f051c65aa7d3 (commit)
      from  057f51af9a2dbdd015f6c69bbfe72c7a1353730a (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=732ff0246956634b57c230beb89e24a3e5772de5
commit 732ff0246956634b57c230beb89e24a3e5772de5
Merge: 057f51a 9f6f517
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue May 5 16:11:41 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 5 16:11:41 2015 -0400

    Merge topic 'improve-policies-documentation' into next
    
    9f6f5179 fixup! Help: Extract Policy doc subtitles from cmPolicies.h


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9f6f51794a94e8f3923f0a29c334f051c65aa7d3
commit 9f6f51794a94e8f3923f0a29c334f051c65aa7d3
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue May 5 22:11:01 2015 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue May 5 22:11:01 2015 +0200

    fixup! Help: Extract Policy doc subtitles from cmPolicies.h

diff --git a/Source/cmRST.cxx b/Source/cmRST.cxx
index 74ceaaa..ff54621 100644
--- a/Source/cmRST.cxx
+++ b/Source/cmRST.cxx
@@ -206,15 +206,16 @@ void cmRST::ProcessLine(std::string const& line)
         }
       else
         {
-        cmPolicies pols;
-
         cmPolicies::PolicyID id;
-        bool b = pols.GetPolicyID(policy.c_str(), id);
+        bool b = cmPolicies::GetPolicyID(policy.c_str(), id);
         if (!b)
           {
           this->NormalLine(line);
           }
-        this->OutputLine(pols.GetPolicyDocTitle(id) + "\n", true);
+        else
+          {
+          this->OutputLine(cmPolicies::GetPolicyDocTitle(id) + "\n", true);
+          }
         }
       }
     else if(this->ParsedLiteralDirective.find(line))

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list