[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3955-g1895661
Rolf Eike Beer
eike at sf-mail.de
Wed Aug 21 15:02:50 EDT 2013
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 18956613a819910bd4c0ac6ed223a938bdb715f8 (commit)
via bf149bd83c041fa6234a055c7305c842d608d51b (commit)
from da83b29d97e604e70733b9a26de1929c9a0e8d7e (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=18956613a819910bd4c0ac6ed223a938bdb715f8
commit 18956613a819910bd4c0ac6ed223a938bdb715f8
Merge: da83b29 bf149bd
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Aug 21 15:02:48 2013 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Aug 21 15:02:48 2013 -0400
Merge topic 'cxx11' into next
bf149bd CXXFeatures: fix deleted_functions fail compile test
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bf149bd83c041fa6234a055c7305c842d608d51b
commit bf149bd83c041fa6234a055c7305c842d608d51b
Author: Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Wed Aug 21 20:59:16 2013 +0200
Commit: Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Wed Aug 21 21:02:23 2013 +0200
CXXFeatures: fix deleted_functions fail compile test
If aggressive optimizations are used the struct could be entirely optimized
away so it's deleted function will cause no error. Make sure the struct is
indeed referenced.
diff --git a/Modules/FindCXXFeatures/cxx11-deleted_functions_fail_compile.cxx b/Modules/FindCXXFeatures/cxx11-deleted_functions_fail_compile.cxx
index f32a7b1..216f074 100644
--- a/Modules/FindCXXFeatures/cxx11-deleted_functions_fail_compile.cxx
+++ b/Modules/FindCXXFeatures/cxx11-deleted_functions_fail_compile.cxx
@@ -1,9 +1,18 @@
struct A {
+ A() = delete;
~A() = delete;
+ int m;
+ int ret();
};
+int A::ret()
+{
+ return 2 * m;
+}
+
int main(void)
{
A bar;
- return 0;
+ bar.m = 1;
+ return bar.ret();
}
-----------------------------------------------------------------------
Summary of changes:
.../cxx11-deleted_functions_fail_compile.cxx | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list