[Cmake-commits] CMake branch, next, updated. v3.6.0-rc3-611-gb89f500

[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  b89f500cc4832b304b4cf604e4955fdaf63a1b13 (commit)
       via  586ec3aaf0ed4c357e06d9baa99d553fa4ad6934 (commit)
      from  567fdf09bb8b533f930e0fe8099159ac7bbd9886 (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=b89f500cc4832b304b4cf604e4955fdaf63a1b13
commit b89f500cc4832b304b4cf604e4955fdaf63a1b13
Merge: 567fdf0 586ec3a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 29 09:47:51 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jun 29 09:47:51 2016 -0400

    Merge topic 'refactor-auto_ptr' into next
    
    586ec3aa fixup! Avoid using KWSys auto_ptr by adopting it ourselves


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=586ec3aaf0ed4c357e06d9baa99d553fa4ad6934
commit 586ec3aaf0ed4c357e06d9baa99d553fa4ad6934
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Jun 29 09:47:28 2016 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Jun 29 09:47:28 2016 -0400

    fixup! Avoid using KWSys auto_ptr by adopting it ourselves

diff --git a/Source/cm_auto_ptr.hxx b/Source/cm_auto_ptr.hxx
index f450228..2cd35c3 100644
--- a/Source/cm_auto_ptr.hxx
+++ b/Source/cm_auto_ptr.hxx
@@ -17,14 +17,14 @@
 // FIXME: Use std::auto_ptr on compilers that do not warn about it.
 #define CM_AUTO_PTR cm::auto_ptr
 
-// The HP compiler and VS6 cannot handle the conversions necessary to use
+// The HP compiler cannot handle the conversions necessary to use
 // auto_ptr_ref to pass an auto_ptr returned from one function
 // directly to another function as in use_auto_ptr(get_auto_ptr()).
 // We instead use const_cast to achieve the syntax on those platforms.
 // We do not use const_cast on other platforms to maintain the C++
 // standard design and guarantee that if an auto_ptr is bound
 // to a reference-to-const then ownership will be maintained.
-#if defined(__HP_aCC) || (defined(_MSC_VER) && _MSC_VER <= 1200)
+#if defined(__HP_aCC)
 #define cm_AUTO_PTR_REF 0
 #define cm_AUTO_PTR_CONST const
 #define cm_AUTO_PTR_CAST(a) cast(a)

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

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


hooks/post-receive
-- 
CMake