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 d9d5bae1f3334d90c3b90f9caefac665aec85e92 (commit)
via 4781525e638fb32d7e434a94380b8389f5e2c446 (commit)
from 1b23e7a76ca0994526b887466e844fd0b639d16a (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=d9d5bae1f3334d90c3b90f9caefac665aec85e92
commit d9d5bae1f3334d90c3b90f9caefac665aec85e92
Merge: 1b23e7a 4781525
Author: Rolf Eike Beer <e...@sf-mail.de>
AuthorDate: Wed Apr 16 02:02:33 2014 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Apr 16 02:02:33 2014 -0400
Merge topic 'local-static' into next
4781525e Revert "cmTarget: mark 2 file-local functions as static"
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4781525e638fb32d7e434a94380b8389f5e2c446
commit 4781525e638fb32d7e434a94380b8389f5e2c446
Author: Rolf Eike Beer <e...@sf-mail.de>
AuthorDate: Wed Apr 16 08:00:35 2014 +0200
Commit: Rolf Eike Beer <e...@sf-mail.de>
CommitDate: Wed Apr 16 08:00:35 2014 +0200
Revert "cmTarget: mark 2 file-local functions as static"
This reverts commit 04f98dca2e7323854583bf1eee2bed0776e62c24.
"/home/kitware/Dashboards/My Tests/CMakeSun/Source/cmTarget.cxx", line
5294: Error: Reference to static compatibilityAgree(CompatibleType, bool) not
allowed in template checkInterfacePropertyCompatibility<bool>(const cmTarget*,
const std::string &, const std::string &, const char*, CompatibleType, bool*),
try using -features=tmplrefstatic.
"/home/kitware/Dashboards/My Tests/CMakeSun/Source/cmTarget.cxx", line
5403: Where: While instantiating
"checkInterfacePropertyCompatibility<bool>(const cmTarget*, const std::string
&, const std::string &, const char*, CompatibleType, bool*)".
"/home/kitware/Dashboards/My Tests/CMakeSun/Source/cmTarget.cxx", line
5403: Where: Instantiated from non-template code.
"/home/kitware/Dashboards/My Tests/CMakeSun/Source/cmTarget.cxx", line
5327: Error: Reference to static compatibilityAgree(CompatibleType, bool) not
allowed in template checkInterfacePropertyCompatibility<bool>(const cmTarget*,
const std::string &, const std::string &, const char*, CompatibleType, bool*),
try using -features=tmplrefstatic.
"/home/kitware/Dashboards/My Tests/CMakeSun/Source/cmTarget.cxx", line
5403: Where: While instantiating
"checkInterfacePropertyCompatibility<bool>(const cmTarget*, const std::string
&, const std::string &, const char*, CompatibleType, bool*)".
"/home/kitware/Dashboards/My Tests/CMakeSun/Source/cmTarget.cxx", line
5403: Where: Instantiated from non-template code.
"/home/kitware/Dashboards/My Tests/CMakeSun/Source/cmTarget.cxx", line
5361: Error: Reference to static compatibilityAgree(CompatibleType, bool) not
allowed in template checkInterfacePropertyCompatibility<bool>(const cmTarget*,
const std::string &, const std::string &, const char*, CompatibleType, bool*),
try using -features=tmplrefstatic.
"/home/kitware/Dashboards/My Tests/CMakeSun/Source/cmTarget.cxx", line
5403: Where: While instantiating
"checkInterfacePropertyCompatibility<bool>(const cmTarget*, const std::string
&, const std::string &, const char*, CompatibleType, bool*)".
"/home/kitware/Dashboards/My Tests/CMakeSun/Source/cmTarget.cxx", line
5403: Where: Instantiated from non-template code.
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index 7bfdda7..ee6cb44 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -5176,7 +5176,7 @@ cmTarget::ReportPropertyOrigin(const std::string &p,
}
//----------------------------------------------------------------------------
-static std::string compatibilityType(CompatibleType t)
+std::string compatibilityType(CompatibleType t)
{
switch(t)
{
@@ -5194,7 +5194,7 @@ static std::string compatibilityType(CompatibleType t)
}
//----------------------------------------------------------------------------
-static std::string compatibilityAgree(CompatibleType t, bool dominant)
+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
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
