[Cmake-commits] CMake branch, master, updated. v3.14.0-rc2-287-g4a79cdc
Kitware Robot
kwrobot at kitware.com
Thu Feb 28 11:03:06 EST 2019
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 4a79cdc85f885abfde9c3da393a55ef8ec947637 (commit)
via a4f2dd9577d23e77ad4daeea0e32bd8283204bdb (commit)
via 93091cabace0b690fb1d977a6df219a42751bb12 (commit)
via 18731d60ac4f14c080ef593c1b1f0a5beb330b02 (commit)
via e6195989c7124904b6263a64e0b16938987cdfcd (commit)
via a605bf438e303b3fa7fa3c3b5dfbcb5164c1e7d7 (commit)
via e17deb7ad4ac83207c9e34d397f3ee054b3d09dd (commit)
via e0d7078f6fe49d28b6c511b8e95d3765637189b5 (commit)
from 8989fa255b7c4d1b9a7598eec29335801292e149 (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=4a79cdc85f885abfde9c3da393a55ef8ec947637
commit 4a79cdc85f885abfde9c3da393a55ef8ec947637
Merge: a4f2dd9 18731d6
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 28 11:01:02 2019 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 28 11:01:02 2019 -0500
Merge branch 'release-3.14'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a4f2dd9577d23e77ad4daeea0e32bd8283204bdb
commit a4f2dd9577d23e77ad4daeea0e32bd8283204bdb
Merge: 93091ca e619598
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 28 16:00:05 2019 +0000
Commit: Kitware Robot <kwrobot at kitware.com>
CommitDate: Thu Feb 28 11:00:13 2019 -0500
Merge topic 'check-std-size-cbegin-cend'
e6195989c7 Merge branch 'backport-check-std-size-cbegin-cend'
a605bf438e Extend C++17/C++14 feature checks to cover more standard library APIs
e17deb7ad4 Extend C++17/C++14 feature checks to cover more standard library APIs
Acked-by: Kitware Robot <kwrobot at kitware.com>
Merge-request: !3030
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=93091cabace0b690fb1d977a6df219a42751bb12
commit 93091cabace0b690fb1d977a6df219a42751bb12
Merge: 8989fa2 e0d7078
Author: Brad King <brad.king at kitware.com>
AuthorDate: Thu Feb 28 10:57:50 2019 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Thu Feb 28 10:57:50 2019 -0500
Merge branch 'release-3.14'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e6195989c7124904b6263a64e0b16938987cdfcd
commit e6195989c7124904b6263a64e0b16938987cdfcd
Merge: a605bf4 e17deb7
Author: Brad King <brad.king at kitware.com>
AuthorDate: Wed Feb 27 11:27:31 2019 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 27 11:27:31 2019 -0500
Merge branch 'backport-check-std-size-cbegin-cend'
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a605bf438e303b3fa7fa3c3b5dfbcb5164c1e7d7
commit a605bf438e303b3fa7fa3c3b5dfbcb5164c1e7d7
Author: Mathieu Garaud <mathieu.garaud at gmail.com>
AuthorDate: Wed Feb 27 15:47:41 2019 +0100
Commit: Brad King <brad.king at kitware.com>
CommitDate: Wed Feb 27 11:27:17 2019 -0500
Extend C++17/C++14 feature checks to cover more standard library APIs
Make sure `std::cbegin`, `std::cend`, and `std::size` work in C++17 or
C++14 mode before choosing the corresponding standard level for
compiling CMake itself. This helps in cases that the compiler is using
a standard library too old to support the full standard level chosen.
diff --git a/Source/Checks/cm_cxx14_check.cpp b/Source/Checks/cm_cxx14_check.cpp
index 9369ba2..fff36c9 100644
--- a/Source/Checks/cm_cxx14_check.cpp
+++ b/Source/Checks/cm_cxx14_check.cpp
@@ -1,8 +1,15 @@
#include <cstdio>
+#include <iterator>
#include <memory>
int main()
{
+ int a[] = { 0, 1, 2 };
+ auto ai = std::cbegin(a);
+
+ int b[] = { 2, 1, 0 };
+ auto bi = std::cend(b);
+
std::unique_ptr<int> u(new int(0));
- return *u;
+ return *u + *ai + *(bi - 1);
}
diff --git a/Source/Checks/cm_cxx17_check.cpp b/Source/Checks/cm_cxx17_check.cpp
index 2de10d6..593d9b2 100644
--- a/Source/Checks/cm_cxx17_check.cpp
+++ b/Source/Checks/cm_cxx17_check.cpp
@@ -1,4 +1,5 @@
#include <cstdio>
+#include <iterator>
#include <memory>
#include <unordered_map>
@@ -8,6 +9,14 @@
int main()
{
+ int a[] = { 0, 1, 2 };
+ auto ai = std::cbegin(a);
+
+ int b[] = { 2, 1, 0 };
+ auto bi = std::cend(b);
+
+ auto ci = std::size(a);
+
std::unique_ptr<int> u(new int(0));
#ifdef _MSC_VER
@@ -18,5 +27,5 @@ int main()
IDispatchPtr disp(ptr);
#endif
- return *u;
+ return *u + *ai + *(bi - 1) + (3 - static_cast<int>(ci));
}
-----------------------------------------------------------------------
Summary of changes:
Source/Checks/cm_cxx14_check.cpp | 9 ++++++++-
Source/Checks/cm_cxx17_check.cpp | 11 ++++++++++-
2 files changed, 18 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list