[Cmake-commits] CMake branch, master, updated. v3.1.0-rc2-370-gc7b9fad

[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, master has been updated
       via  c7b9fad117a8036bb1a1bece633bacff426d30fb (commit)
       via  12cb0b868c462ec64f1578f5450e64246986c58d (commit)
       via  ba74465fbcd2509415397c1df93b1c86e70a45ab (commit)
       via  41363c0c615848e9708c9105b0daeeef98f1f427 (commit)
       via  4efcfe52f491a6cd43809d5a182192060d77c5e8 (commit)
       via  5f4695cd06a124236520c8a28d8b65929f83bd3f (commit)
       via  7a0643379be273e64a6454be4be51e652ff093c4 (commit)
       via  fdb73547220ed9e9bee0806abf388b830ac79bd5 (commit)
      from  a11dda1c4883eddf763ba1eb2979b45220886b01 (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=c7b9fad117a8036bb1a1bece633bacff426d30fb
commit c7b9fad117a8036bb1a1bece633bacff426d30fb
Merge: a11dda1 12cb0b8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Nov 25 10:28:57 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Nov 25 10:28:57 2014 -0500

    Merge topic 'remove-ancient-msvc-workarounds'
    
    12cb0b86 Help: Update developer manual with some C++ features now permitted.
    ba74465f cmGeneratorTarget: Remove MSVC7 workaround
    41363c0c VisualStudio: Remove MSVC6 compatibility macro.
    4efcfe52 cmSystemTools: Remove MSVC6 compatibility define.
    5f4695cd cmStandardIncludes: Remove MSVC6 condition for cmArrayBegin macro.
    7a064337 cmFindCommon: Remove MSVC6 workaround for nested struct private access.
    fdb73547 cmTarget: Remove std::min and std::max MSVC6 compatibility code.

diff --cc Source/cmTarget.cxx
index fb3571d,d4889fd..edae18f
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@@ -4812,9 -4806,13 +4802,9 @@@ std::pair<bool, const char*> consistent
      return std::pair<bool, const char*>(false, null_ptr);
      }
  
 -#if !defined(_MSC_VER)
 -#undef null_ptr
 -#endif
 -
    if (t == NumberMaxType)
      {
-     return std::make_pair(true, cmMaximum(lnum, rnum) == lnum ? lhs : rhs);
+     return std::make_pair(true, std::max(lnum, rnum) == lnum ? lhs : rhs);
      }
    else
      {

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

Summary of changes:
 Help/manual/cmake-developer.7.rst  |    8 +-------
 Source/cmCallVisualStudioMacro.cxx |    6 ------
 Source/cmFindCommon.h              |    7 -------
 Source/cmGeneratorTarget.cxx       |   20 --------------------
 Source/cmStandardIncludes.h        |    3 +--
 Source/cmSystemTools.cxx           |    4 +---
 Source/cmTarget.cxx                |   14 ++------------
 7 files changed, 5 insertions(+), 57 deletions(-)


hooks/post-receive
-- 
CMake