[Cmake-commits] CMake branch, next, updated. v3.3.2-3394-ge3eb67f

[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  e3eb67f7bcf91008086675f7f023210b594fe925 (commit)
       via  f90acf522b1a03af9b5a7bea1d3f50285504fce8 (commit)
       via  e67e0155d9dfbcf9691b0863978b441545a89565 (commit)
       via  11733d2dae0a844c2cfa5824bb1cac7b6a405c16 (commit)
      from  847bd5efb03d8394bc41cfcb8e2b72e20e7cfb6e (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e3eb67f7bcf91008086675f7f023210b594fe925
commit e3eb67f7bcf91008086675f7f023210b594fe925
Merge: 847bd5e f90acf5
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 30 08:54:20 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 30 08:54:20 2015 -0400

    Merge topic 'fix-warnings' into next
    
    f90acf52 cmVisualStudio10TargetGenerator: Fix unsigned integer constant type
    e67e0155 cmMakefile: Avoid name conflict with Solaris global typedef
    11733d2d CMake Nightly Date Stamp


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f90acf522b1a03af9b5a7bea1d3f50285504fce8
commit f90acf522b1a03af9b5a7bea1d3f50285504fce8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 30 08:53:09 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 30 08:53:09 2015 -0400

    cmVisualStudio10TargetGenerator: Fix unsigned integer constant type
    
    Add a 'u' suffix to FILETIME component integer constant initializers.
    This avoids warnings about the range of the signed constant value.

diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 6c71313..fcd8f2a 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -3475,7 +3475,7 @@ bool cmVisualStudio10TargetGenerator::ForceOld(const std::string& source) const
     return false;
     }
 
-  FILETIME const ftime_20010101 = { 3365781504, 29389701 };
+  FILETIME const ftime_20010101 = { 3365781504u, 29389701u };
   if (!SetFileTime(h, &ftime_20010101, &ftime_20010101, &ftime_20010101))
     {
     CloseHandle(h);

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e67e0155d9dfbcf9691b0863978b441545a89565
commit e67e0155d9dfbcf9691b0863978b441545a89565
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Sep 30 08:47:02 2015 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Sep 30 08:47:02 2015 -0400

    cmMakefile: Avoid name conflict with Solaris global typedef
    
    On Solaris there is a global typedef called 'single':
    
     /usr/include/floatingpoint.h:77:15: note: shadowed declaration is here
      typedef float single;
    
    Avoid shadowing it by using a different name.

diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index c70756a..077470d 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -3218,7 +3218,7 @@ void cmMakefile::AddDefaultDefinitions()
 //----------------------------------------------------------------------------
 std::string
 cmMakefile::GetConfigurations(std::vector<std::string>& configs,
-                              bool single) const
+                              bool singleConfig) const
 {
   if(this->GetGlobalGenerator()->IsMultiConfig())
     {
@@ -3232,7 +3232,7 @@ cmMakefile::GetConfigurations(std::vector<std::string>& configs,
   else
     {
     const std::string& buildType = this->GetSafeDefinition("CMAKE_BUILD_TYPE");
-    if(single && !buildType.empty())
+    if(singleConfig && !buildType.empty())
       {
       configs.push_back(buildType);
       }

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

Summary of changes:
 Source/CMakeVersion.cmake                  |    2 +-
 Source/cmMakefile.cxx                      |    4 ++--
 Source/cmVisualStudio10TargetGenerator.cxx |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)


hooks/post-receive
-- 
CMake