[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-2366-g428d92b

[Rolf Eike Beer]

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  428d92b47c6e78344d9d16d017b4f6cdfc5c1799 (commit)
       via  04f98dca2e7323854583bf1eee2bed0776e62c24 (commit)
      from  e49df8ed2ad9a553debb3859f66d63816805847f (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=428d92b47c6e78344d9d16d017b4f6cdfc5c1799
commit 428d92b47c6e78344d9d16d017b4f6cdfc5c1799
Merge: e49df8e 04f98dc
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Apr 15 14:21:58 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Apr 15 14:21:58 2014 -0400

    Merge topic 'local-static' into next
    
    04f98dca cmTarget: mark 2 file-local functions as static


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=04f98dca2e7323854583bf1eee2bed0776e62c24
commit 04f98dca2e7323854583bf1eee2bed0776e62c24
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue Apr 15 20:19:47 2014 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Tue Apr 15 20:19:47 2014 +0200

    cmTarget: mark 2 file-local functions as static

diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index ee6cb44..7bfdda7 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -5176,7 +5176,7 @@ cmTarget::ReportPropertyOrigin(const std::string &p,
 }
 
 //----------------------------------------------------------------------------
-std::string compatibilityType(CompatibleType t)
+static std::string compatibilityType(CompatibleType t)
 {
   switch(t)
     {
@@ -5194,7 +5194,7 @@ std::string compatibilityType(CompatibleType t)
 }
 
 //----------------------------------------------------------------------------
-std::string compatibilityAgree(CompatibleType t, bool dominant)
+static std::string compatibilityAgree(CompatibleType t, bool dominant)
 {
   switch(t)
     {

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

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


hooks/post-receive
-- 
CMake