[Cmake-commits] CMake branch, next, updated. v2.8.2-139-gf73ec0b

[Brad King]

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  f73ec0b955012dc1c5b7e61ebb8001f99f2088b7 (commit)
       via  c8ea2705a7115208f59839828a82b42a58293576 (commit)
      from  87105efb8cfa1dfb2566e2862620e5dc32b58d4c (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=f73ec0b955012dc1c5b7e61ebb8001f99f2088b7
commit f73ec0b955012dc1c5b7e61ebb8001f99f2088b7
Merge: 87105ef c8ea270
Author: Brad King <brad.king at kitware.com>
Date:   Tue Jun 29 10:03:31 2010 -0400

    Merge branch 'user-override-try-compile' into next


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c8ea2705a7115208f59839828a82b42a58293576
commit c8ea2705a7115208f59839828a82b42a58293576
Author: Brad King <brad.king at kitware.com>
Date:   Tue Jun 29 10:01:59 2010 -0400

    Use same type in both cases of '?:' operator
    
    Both possible result values need to be convertible to the same type.
    Some compilers fail to recognize that they can construct std::string
    from the empty string literal, so state it explicitly.

diff --git a/Source/cmCoreTryCompile.cxx b/Source/cmCoreTryCompile.cxx
index fcec3e9..b8a0c95 100644
--- a/Source/cmCoreTryCompile.cxx
+++ b/Source/cmCoreTryCompile.cxx
@@ -178,7 +178,7 @@ int cmCoreTryCompile::TryCompileCode(std::vector<std::string> const& argv)
 
     const char* rulesOverrideBase = "CMAKE_USER_MAKE_RULES_OVERRIDE";
     std::string rulesOverrideLang =
-      rulesOverrideBase + (lang ? std::string("_") + lang : "");
+      rulesOverrideBase + (lang ? std::string("_") + lang : std::string(""));
     if(const char* rulesOverridePath =
        this->Makefile->GetDefinition(rulesOverrideLang.c_str()))
       {

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

Summary of changes:
 Source/cmCoreTryCompile.cxx |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake