[Cmake-commits] CMake branch, next, updated. v3.1.0-rc2-748-gbb7a0ad

[Stephen Kelly]

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  bb7a0ad79b00307da073c5c34a92173a92558f2f (commit)
       via  c5df7d10882203e1b6ef34e1fb6cd1c42036afea (commit)
      from  82cfc649ad24111fa433813886992ddd807af638 (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=bb7a0ad79b00307da073c5c34a92173a92558f2f
commit bb7a0ad79b00307da073c5c34a92173a92558f2f
Merge: 82cfc64 c5df7d1
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Wed Nov 19 19:43:56 2014 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Nov 19 19:43:56 2014 -0500

    Merge topic 'default-lang-dialect' into next
    
    c5df7d10 Make the preprocessor report the actual value of the macro.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c5df7d10882203e1b6ef34e1fb6cd1c42036afea
commit c5df7d10882203e1b6ef34e1fb6cd1c42036afea
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Thu Nov 20 01:43:09 2014 +0100
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Thu Nov 20 01:43:09 2014 +0100

    Make the preprocessor report the actual value of the macro.

diff --git a/Tests/CompileFeatures/default_dialect.cpp b/Tests/CompileFeatures/default_dialect.cpp
index 10d2170..8d97926 100644
--- a/Tests/CompileFeatures/default_dialect.cpp
+++ b/Tests/CompileFeatures/default_dialect.cpp
@@ -1,18 +1,21 @@
 
+template<long l>
+struct Outputter;
+
 #if DEFAULT_CXX14
 #  if __cplusplus != 201402L
-#    error Unexpected value for __cplusplus.
+Outputter<__cplusplus> o;
 #  endif
 #elif DEFAULT_CXX11
 #  if __cplusplus != 201103L
-#    error Unexpected value for __cplusplus.
+Outputter<__cplusplus> o;
 #  endif
 #else
 #  if !DEFAULT_CXX98
 #    error Buildsystem error
 #  endif
 #  if __cplusplus != 199711L
-#    error Unexpected __cplusplus value
+Outputter<__cplusplus> o;
 #  endif
 #endif
 

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

Summary of changes:
 Tests/CompileFeatures/default_dialect.cpp |    9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake