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 dbf41e4b9e41704ea0c0b40bd61e21c8647f1b28 (commit)
via f39baea8745ddee088dcfdf392966ccecea8d1d9 (commit)
via 12cb0b868c462ec64f1578f5450e64246986c58d (commit)
via ba74465fbcd2509415397c1df93b1c86e70a45ab (commit)
via 41363c0c615848e9708c9105b0daeeef98f1f427 (commit)
via 4efcfe52f491a6cd43809d5a182192060d77c5e8 (commit)
via 5f4695cd06a124236520c8a28d8b65929f83bd3f (commit)
via 7a0643379be273e64a6454be4be51e652ff093c4 (commit)
via fdb73547220ed9e9bee0806abf388b830ac79bd5 (commit)
from 5c5d83c996d5cbbee6d57b1b09f41a24f7e809b8 (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=dbf41e4b9e41704ea0c0b40bd61e21c8647f1b28
commit dbf41e4b9e41704ea0c0b40bd61e21c8647f1b28
Merge: 5c5d83c f39baea
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Thu Nov 20 17:14:01 2014 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Nov 20 17:14:01 2014 -0500
Merge topic 'remove-ancient-msvc-workarounds' into next
f39baea8 cmTarget: Use clear and append on std::string.
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 4a5cc64,4f4feaf..725067b
--- 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
{
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f39baea8745ddee088dcfdf392966ccecea8d1d9
commit f39baea8745ddee088dcfdf392966ccecea8d1d9
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Thu Nov 20 23:13:05 2014 +0100
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Thu Nov 20 23:13:05 2014 +0100
cmTarget: Use clear and append on std::string.
To see if the dashboard now accepts it.
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index d4889fd..4f4feaf 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -2908,14 +2908,14 @@ bool cmTarget::HandleLocationPropertyPolicy(cmMakefile*
context) const
static void MakePropertyList(std::string& output,
std::vector<cmTargetInternals::TargetPropertyEntry*> const& values)
{
- output = "";
+ output.clear();
std::string sep;
for (std::vector<cmTargetInternals::TargetPropertyEntry*>::const_iterator
it = values.begin(), end = values.end();
it != end; ++it)
{
- output += sep;
- output += (*it)->ge->GetInput();
+ output.append(sep);
+ output.append((*it)->ge->GetInput());
sep = ";";
}
}
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=12cb0b868c462ec64f1578f5450e64246986c58d
commit 12cb0b868c462ec64f1578f5450e64246986c58d
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Thu Nov 20 23:11:38 2014 +0100
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Thu Nov 20 23:11:38 2014 +0100
Help: Update developer manual with some C++ features now permitted.
diff --git a/Help/manual/cmake-developer.7.rst
b/Help/manual/cmake-developer.7.rst
index 0884a59..34e3225 100644
--- a/Help/manual/cmake-developer.7.rst
+++ b/Help/manual/cmake-developer.7.rst
@@ -147,7 +147,7 @@ A loop must be used instead:
theSet.insert(*it);
}
-.. MSVC6, SunCC 5.9
+.. SunCC 5.9
Template Parameter Defaults
---------------------------
@@ -177,12 +177,6 @@ this does not work with other ancient compilers:
and invoke it with the value ``0`` explicitly in all cases.
-std::min and std::max
----------------------
-
-``min`` and ``max`` are defined as macros on some systems. ``std::min`` and
-``std::max`` may not be used. Use ``cmMinimum`` and ``cmMaximum`` instead.
-
size_t
------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ba74465fbcd2509415397c1df93b1c86e70a45ab
commit ba74465fbcd2509415397c1df93b1c86e70a45ab
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Thu Nov 20 23:07:22 2014 +0100
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Thu Nov 20 23:07:22 2014 +0100
cmGeneratorTarget: Remove MSVC7 workaround
Use partial specialization everywhere.
diff --git a/Source/cmGeneratorTarget.cxx b/Source/cmGeneratorTarget.cxx
index 5836a27..2b531e2 100644
--- a/Source/cmGeneratorTarget.cxx
+++ b/Source/cmGeneratorTarget.cxx
@@ -56,7 +56,6 @@ struct ModuleDefinitionFileTag {};
struct AppManifestTag{};
struct CertificatesTag{};
-#if !defined(_MSC_VER) || _MSC_VER >= 1310
template<typename Tag, typename OtherTag>
struct IsSameTag
{
@@ -72,25 +71,6 @@ struct IsSameTag<Tag, Tag>
Result = true
};
};
-#else
-struct IsSameTagBase
-{
- typedef char (&no_type)[1];
- typedef char (&yes_type)[2];
- template<typename T> struct Check;
- template<typename T> static yes_type check(Check<T>*, Check<T>*);
- static no_type check(...);
-};
-template<typename Tag1, typename Tag2>
-struct IsSameTag: public IsSameTagBase
-{
- enum {
- Result = (sizeof(check(static_cast< Check<Tag1>* >(0),
- static_cast< Check<Tag2>* >(0))) ==
- sizeof(yes_type))
- };
-};
-#endif
template<bool>
struct DoAccept
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=41363c0c615848e9708c9105b0daeeef98f1f427
commit 41363c0c615848e9708c9105b0daeeef98f1f427
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Thu Nov 20 22:25:44 2014 +0100
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Thu Nov 20 22:25:44 2014 +0100
VisualStudio: Remove MSVC6 compatibility macro.
diff --git a/Source/cmCallVisualStudioMacro.cxx
b/Source/cmCallVisualStudioMacro.cxx
index 8f22f80..c211111 100644
--- a/Source/cmCallVisualStudioMacro.cxx
+++ b/Source/cmCallVisualStudioMacro.cxx
@@ -34,8 +34,6 @@ static bool LogErrorsAsMessages;
// Copied from a correct comdef.h to avoid problems with deficient versions
// of comdef.h that exist in the wild... Fixes issue #7533.
//
-#if ( _MSC_VER >= 1300 )
-// VS7 and later:
#ifdef _NATIVE_WCHAR_T_DEFINED
# ifdef _DEBUG
# pragma comment(lib, "comsuppwd.lib")
@@ -49,10 +47,6 @@ static bool LogErrorsAsMessages;
# pragma comment(lib, "comsupp.lib")
# endif
#endif
-#else
-// VS6 only had comsupp.lib:
-# pragma comment(lib, "comsupp.lib")
-#endif
//----------------------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4efcfe52f491a6cd43809d5a182192060d77c5e8
commit 4efcfe52f491a6cd43809d5a182192060d77c5e8
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Thu Nov 20 22:24:27 2014 +0100
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Thu Nov 20 22:24:27 2014 +0100
cmSystemTools: Remove MSVC6 compatibility define.
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 3247f7f..f6f800c 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -9,9 +9,7 @@
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the License for more information.
============================================================================*/
-#if defined(_MSC_VER) && _MSC_VER < 1300
-# define _WIN32_WINNT 0x0400 /* for wincrypt.h */
-#endif
+
#include "cmSystemTools.h"
#include <ctype.h>
#include <errno.h>
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5f4695cd06a124236520c8a28d8b65929f83bd3f
commit 5f4695cd06a124236520c8a28d8b65929f83bd3f
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Thu Nov 20 22:22:45 2014 +0100
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Thu Nov 20 22:22:45 2014 +0100
cmStandardIncludes: Remove MSVC6 condition for cmArrayBegin macro.
diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index ffabd7a..6b85634 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -393,8 +393,7 @@ inline bool cmHasLiteralSuffixImpl(const char* str1,
return len >= N && strcmp(str1 + len - N, str2) == 0;
}
-#if defined(_MSC_VER) && _MSC_VER < 1300 \
- || defined(__GNUC__) && __GNUC__ < 3
+#if defined(__GNUC__) && __GNUC__ < 3
#define cmArrayBegin(a) a
#define cmArraySize(a) (sizeof(a)/sizeof(*a))
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7a0643379be273e64a6454be4be51e652ff093c4
commit 7a0643379be273e64a6454be4be51e652ff093c4
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Thu Nov 20 22:22:00 2014 +0100
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Thu Nov 20 22:22:00 2014 +0100
cmFindCommon: Remove MSVC6 workaround for nested struct private access.
diff --git a/Source/cmFindCommon.h b/Source/cmFindCommon.h
index e65b2fc..3fefc8d 100644
--- a/Source/cmFindCommon.h
+++ b/Source/cmFindCommon.h
@@ -33,10 +33,6 @@ public:
protected:
friend class cmSearchPath;
-/* VS6 is broken and can't pass protected class definitions to child classes */
-#if defined(_MSC_VER) && (_MSC_VER < 1300)
-public:
-#endif
/** Used to define groups of path labels */
class PathGroup : public cmPathLabel
{
@@ -61,9 +57,6 @@ public:
static PathLabel CMakeSystem;
static PathLabel Guess;
};
-#if defined(_MSC_VER) && (_MSC_VER < 1300)
-protected:
-#endif
enum RootPathMode { RootPathModeNever,
RootPathModeOnly,
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fdb73547220ed9e9bee0806abf388b830ac79bd5
commit fdb73547220ed9e9bee0806abf388b830ac79bd5
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Thu Nov 20 22:17:16 2014 +0100
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Thu Nov 20 22:17:16 2014 +0100
cmTarget: Remove std::min and std::max MSVC6 compatibility code.
CMake is no longer required to build with MSVC6.
diff --git a/Source/cmTarget.cxx b/Source/cmTarget.cxx
index ee62f06..d4889fd 100644
--- a/Source/cmTarget.cxx
+++ b/Source/cmTarget.cxx
@@ -4781,16 +4781,6 @@ std::pair<bool, const char*>
consistentStringProperty(const char *lhs,
return std::make_pair(b, b ? lhs : 0);
}
-#if defined(_MSC_VER) && _MSC_VER <= 1200
-template<typename T> const T&
-cmMaximum(const T& l, const T& r) {return l > r ? l : r;}
-template<typename T> const T&
-cmMinimum(const T& l, const T& r) {return l < r ? l : r;}
-#else
-#define cmMinimum std::min
-#define cmMaximum std::max
-#endif
-
//----------------------------------------------------------------------------
std::pair<bool, const char*> consistentNumberProperty(const char *lhs,
const char *rhs,
@@ -4822,11 +4812,11 @@ std::pair<bool, const char*>
consistentNumberProperty(const char *lhs,
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
{
- return std::make_pair(true, cmMinimum(lnum, rnum) == lnum ? lhs : rhs);
+ return std::make_pair(true, std::min(lnum, rnum) == lnum ? lhs : rhs);
}
}
-----------------------------------------------------------------------
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 | 20 +++++---------------
7 files changed, 8 insertions(+), 60 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
