[Cmake-commits] CMake branch, next, updated. v3.6.2-1945-gc6d96a2
Brad King
brad.king at kitware.com
Mon Sep 12 10:09:42 EDT 2016
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 c6d96a2f67c494ef9a918225cd95498d42dcc5a8 (commit)
via 68b616696283212ecc6fcbdbab16e84a5d773f33 (commit)
from deeb60ef1fb7d23d4a6a5579b6745197dc033411 (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=c6d96a2f67c494ef9a918225cd95498d42dcc5a8
commit c6d96a2f67c494ef9a918225cd95498d42dcc5a8
Merge: deeb60e 68b6166
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 12 10:09:41 2016 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 12 10:09:41 2016 -0400
Merge topic 'geh-failure-tests' into next
68b61669 Tests: Fix GenerateExportHeader code style
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=68b616696283212ecc6fcbdbab16e84a5d773f33
commit 68b616696283212ecc6fcbdbab16e84a5d773f33
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 12 10:09:08 2016 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Sep 12 10:09:08 2016 -0400
Tests: Fix GenerateExportHeader code style
diff --git a/Tests/RunCMake/GenerateExportHeader/exportheader_test.cpp b/Tests/RunCMake/GenerateExportHeader/exportheader_test.cpp
index db1ab49..7e3e0e4 100644
--- a/Tests/RunCMake/GenerateExportHeader/exportheader_test.cpp
+++ b/Tests/RunCMake/GenerateExportHeader/exportheader_test.cpp
@@ -57,15 +57,15 @@ int main()
{
{
libshared::Class l;
- //l.method(); LINK ERROR
+ // l.method(); LINK ERROR
l.method_exported();
- //l.method_deprecated(); LINK ERROR
+ // l.method_deprecated(); LINK ERROR
l.method_deprecated_exported();
- //l.method_excluded(); LINK ERROR
+ // l.method_excluded(); LINK ERROR
- //use_int(l.data); LINK ERROR
+ // use_int(l.data); LINK ERROR
use_int(l.data_exported);
- //use_int(l.data_excluded); LINK ERROR
+ // use_int(l.data_excluded); LINK ERROR
}
{
@@ -75,39 +75,39 @@ int main()
#if defined(_WIN32) || defined(__CYGWIN__)
l.method_excluded();
#else
- //l.method_excluded(); LINK ERROR (NOT WIN32 AND NOT CYGWIN)
+// l.method_excluded(); LINK ERROR (NOT WIN32 AND NOT CYGWIN)
#endif
use_int(l.data);
#if defined(_WIN32) || defined(__CYGWIN__)
use_int(l.data_excluded);
#else
- //use_int(l.data_excluded); LINK ERROR (NOT WIN32 AND NOT CYGWIN)
+// use_int(l.data_excluded); LINK ERROR (NOT WIN32 AND NOT CYGWIN)
#endif
}
{
libshared::ExcludedClass l;
- //l.method(); LINK ERROR
+ // l.method(); LINK ERROR
l.method_exported();
- //l.method_deprecated(); LINK ERROR
+ // l.method_deprecated(); LINK ERROR
l.method_deprecated_exported();
- //l.method_excluded(); LINK ERROR
+ // l.method_excluded(); LINK ERROR
- //use_int(l.data); LINK ERROR
+ // use_int(l.data); LINK ERROR
use_int(l.data_exported);
- //use_int(l.data_excluded); LINK ERROR
+ // use_int(l.data_excluded); LINK ERROR
}
- //libshared::function(); LINK ERROR
+ // libshared::function(); LINK ERROR
libshared::function_exported();
- //libshared::function_deprecated(); LINK ERROR
+ // libshared::function_deprecated(); LINK ERROR
libshared::function_deprecated_exported();
- //libshared::function_excluded(); LINK ERROR
+ // libshared::function_excluded(); LINK ERROR
- //use_int(libshared::data); LINK ERROR
+ // use_int(libshared::data); LINK ERROR
use_int(libshared::data_exported);
- //use_int(libshared::data_excluded); LINK ERROR
+ // use_int(libshared::data_excluded); LINK ERROR
{
libstatic::Class l;
diff --git a/Tests/RunCMake/GenerateExportHeader/lib_shared_and_static/libshared_and_static.h b/Tests/RunCMake/GenerateExportHeader/lib_shared_and_static/libshared_and_static.h
index 14b0109..2c3fcfd 100644
--- a/Tests/RunCMake/GenerateExportHeader/lib_shared_and_static/libshared_and_static.h
+++ b/Tests/RunCMake/GenerateExportHeader/lib_shared_and_static/libshared_and_static.h
@@ -3,8 +3,7 @@
#include "libshared_and_static_export.h"
-namespace libshared_and_static
-{
+namespace libshared_and_static {
class Class
{
@@ -15,7 +14,8 @@ public:
int MYPREFIX_LIBSHARED_AND_STATIC_DEPRECATED method_deprecated() const;
- int MYPREFIX_LIBSHARED_AND_STATIC_DEPRECATED_EXPORT method_deprecated_exported() const;
+ int MYPREFIX_LIBSHARED_AND_STATIC_DEPRECATED_EXPORT
+ method_deprecated_exported() const;
int MYPREFIX_LIBSHARED_AND_STATIC_NO_EXPORT method_excluded() const;
@@ -49,7 +49,8 @@ public:
int MYPREFIX_LIBSHARED_AND_STATIC_DEPRECATED method_deprecated() const;
- int MYPREFIX_LIBSHARED_AND_STATIC_DEPRECATED_EXPORT method_deprecated_exported() const;
+ int MYPREFIX_LIBSHARED_AND_STATIC_DEPRECATED_EXPORT
+ method_deprecated_exported() const;
int MYPREFIX_LIBSHARED_AND_STATIC_NO_EXPORT method_excluded() const;
@@ -66,7 +67,8 @@ int MYPREFIX_LIBSHARED_AND_STATIC_EXPORT function_exported();
int MYPREFIX_LIBSHARED_AND_STATIC_DEPRECATED function_deprecated();
-int MYPREFIX_LIBSHARED_AND_STATIC_DEPRECATED_EXPORT function_deprecated_exported();
+int MYPREFIX_LIBSHARED_AND_STATIC_DEPRECATED_EXPORT
+function_deprecated_exported();
int MYPREFIX_LIBSHARED_AND_STATIC_NO_EXPORT function_excluded();
diff --git a/Tests/RunCMake/GenerateExportHeader/libshared/libshared.h b/Tests/RunCMake/GenerateExportHeader/libshared/libshared.h
index d24905f..6574bd5 100644
--- a/Tests/RunCMake/GenerateExportHeader/libshared/libshared.h
+++ b/Tests/RunCMake/GenerateExportHeader/libshared/libshared.h
@@ -3,8 +3,7 @@
#include "libshared_export.h"
-namespace libshared
-{
+namespace libshared {
class Class
{
diff --git a/Tests/RunCMake/GenerateExportHeader/libstatic/libstatic.h b/Tests/RunCMake/GenerateExportHeader/libstatic/libstatic.h
index a40e732..1017e12 100644
--- a/Tests/RunCMake/GenerateExportHeader/libstatic/libstatic.h
+++ b/Tests/RunCMake/GenerateExportHeader/libstatic/libstatic.h
@@ -3,8 +3,7 @@
#include "libstatic_export.h"
-namespace libstatic
-{
+namespace libstatic {
class Class
{
-----------------------------------------------------------------------
Summary of changes:
.../GenerateExportHeader/exportheader_test.cpp | 34 ++++++++++----------
.../lib_shared_and_static/libshared_and_static.h | 12 ++++---
.../GenerateExportHeader/libshared/libshared.h | 3 +-
.../GenerateExportHeader/libstatic/libstatic.h | 3 +-
4 files changed, 26 insertions(+), 26 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list