<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0bc1ae9bc07dff8fc80858a8198cd9c38477acd3">https://github.com/macports/macports-ports/commit/0bc1ae9bc07dff8fc80858a8198cd9c38477acd3</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 0bc1ae9 cmake-devel: update to 20190901-ff7c31ab
</span>0bc1ae9 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0bc1ae9bc07dff8fc80858a8198cd9c38477acd3
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Sun Sep 1 08:00:37 2019 -0400
<span style='display:block; white-space:pre;color:#404040;'> cmake-devel: update to 20190901-ff7c31ab
</span>---
devel/cmake/Portfile | 10 +--
.../files/patch-fix_cxx14_17_checks.devel.diff | 86 ++++++++--------------
2 files changed, 36 insertions(+), 60 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/Portfile b/devel/cmake/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cbc63f0..a1557b8 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,11 +76,11 @@ if {${subport} eq ${name}} {
</span>
# devel
<span style='display:block; white-space:pre;background:#ffe0e0;'>- set commit 34301441b963a2d7e02b4a4355a6634b3bbb7977
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version 20190817-[string range ${commit} 0 7]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- checksums rmd160 648dbbce5f0928142c80c5ae2dda77b32100b16a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 79de927f4c550aa6631b147a7601afaa8edb6e62973c3eb1bee1eaf7504f6a3f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 6993428
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set commit ff7c31abfd110e769e422d5005a8a41b21153fd6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version 20190901-[string range ${commit} 0 7]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ checksums rmd160 f43328f82238cdd6f3f5e06cddf93a7be089ef15 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 89af1c21bdfc05cf672bceedba838f4e95a99c66ab40128cedf819bd216dd24e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 6988656
</span> revision 0
use_bzip2 yes
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/cmake/files/patch-fix_cxx14_17_checks.devel.diff b/devel/cmake/files/patch-fix_cxx14_17_checks.devel.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 2930d38..1a488b1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/cmake/files/patch-fix_cxx14_17_checks.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/cmake/files/patch-fix_cxx14_17_checks.devel.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,68 +1,40 @@
</span> --- Source/Checks/cm_cxx14_check.cpp.orig
+++ Source/Checks/cm_cxx14_check.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,15 +1,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <cstdio>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <iterator>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,9 +1,18 @@
</span> +// actually use c++14 feature to force the compiler to do something,
+// since it might otherwise try to optimize all of this out even if it
+// doesn't understand it.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span> +#include <iostream>
<span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <cstdio>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <iterator>
</span> #include <memory>
<span style='display:block; white-space:pre;background:#ffe0e0;'>--int main()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+int
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+main
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int main()
</span> {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- int a[] = { 0, 1, 2 };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- auto ai = std::cbegin(a);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int b[] = { 2, 1, 0 };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- auto bi = std::cend(b);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- std::unique_ptr<int> u(new int(0));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return *u + *ai + *(bi - 1);
</span> + std::unique_ptr < int > foo = std::make_unique < int > (4);
+ std::cout << "std::make_unique < int >(4) is '"
+ << *foo << "'" << std::endl;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int a[] = { 0, 1, 2 };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ auto ai = std::cbegin(a);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> --- Source/Checks/cm_cxx17_check.cpp.orig
+++ Source/Checks/cm_cxx17_check.cpp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,31 +1,27 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <cstdio>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <iterator>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <memory>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <unordered_map>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+// requires c++17 or newer, so will fail tests of c++14 or earlier
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <optional>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef _MSC_VER
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# include <comdef.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,3 +1,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// actually use c++14 feature to force the compiler to do something,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// since it might otherwise try to optimize all of this out even if it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// doesn't understand it.
</span> +#include <iostream>
+#include <string>
<span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <cstdio>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <iterator>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <memory>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -8,6 +14,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # include <comdef.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>--int main()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int a[] = { 0, 1, 2 };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- auto ai = std::cbegin(a);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int b[] = { 2, 1, 0 };
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- auto bi = std::cend(b);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- auto ci = std::size(a);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- std::unique_ptr<int> u(new int(0));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifdef _MSC_VER
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- // clang-cl has problems instantiating this constructor in C++17 mode
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- // error: indirection requires pointer operand ('const _GUID' invalid)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- // return *_IID;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- IUnknownPtr ptr{};
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- IDispatchPtr disp(ptr);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span> +std::optional < std::string >
+create
+(bool b) {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -71,17 +43,21 @@
</span> + }
+ return {};
+}
<span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int main()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int a[] = { 0, 1, 2 };
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -28,6 +43,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IDispatchPtr disp(ptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- return *u + *ai + *(bi - 1) + (3 - static_cast<int>(ci));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+int
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+main
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span> + std::cout << "create(false) returned "
+ << create(false).value_or("empty")
+ << std::endl;
+ std::cout << "create(true) returned "
+ << create(true).value_or("empty")
+ << std::endl;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ std::optional<int> oi = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return *u + *ai + *(bi - 1) + (3 - static_cast<int>(ci)) + oi.value();
</span></pre><pre style='margin:0'>
</pre>