diff options
| author | Brad King <brad.king@kitware.com> | 2018-06-01 16:52:10 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2018-06-01 16:52:38 (GMT) |
| commit | eed0df951d95d48e7856107175a2baba212c3206 (patch) | |
| tree | d9ac3ded5ae6899be7188795011743fe3e6da0a6 /Tests/InterfaceLibrary | |
| parent | b671e4799f0e418448681a21120e8e87a97de5dc (diff) | |
| parent | d7204e649ed4ebb19bb341b4e49eb51514364922 (diff) | |
| download | CMake-eed0df951d95d48e7856107175a2baba212c3206.zip CMake-eed0df951d95d48e7856107175a2baba212c3206.tar.gz CMake-eed0df951d95d48e7856107175a2baba212c3206.tar.bz2 | |
Merge topic 'clang-format-6.0'
d7204e649e Revise C++ coding style using clang-format-6.0
12fed3edb1 Empty commit at end of history preceding clang-format-6.0 style transition
523c443d13 clang-format.bash: update to clang-format-6.0
eb7ec19c1c clang-format: Add comments to suppress some formatting
b67a5bf175 Tests/VSWinStorePhone: Do not format managed source
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sebastian Holtermann <sebholt@xwmw.org>
Merge-request: !2123
Diffstat (limited to 'Tests/InterfaceLibrary')
| -rw-r--r-- | Tests/InterfaceLibrary/definetestexe.cpp | 6 | ||||
| -rw-r--r-- | Tests/InterfaceLibrary/map_config.cpp | 12 | ||||
| -rw-r--r-- | Tests/InterfaceLibrary/sharedlibtestexe.cpp | 6 |
3 files changed, 12 insertions, 12 deletions
diff --git a/Tests/InterfaceLibrary/definetestexe.cpp b/Tests/InterfaceLibrary/definetestexe.cpp index 098502c..9156426 100644 --- a/Tests/InterfaceLibrary/definetestexe.cpp +++ b/Tests/InterfaceLibrary/definetestexe.cpp @@ -1,18 +1,18 @@ #ifndef IFACE_DEFINE -#error Expected IFACE_DEFINE +# error Expected IFACE_DEFINE #endif #include "iface_header.h" #ifndef IFACE_HEADER_SRCDIR -#error Expected IFACE_HEADER_SRCDIR +# error Expected IFACE_HEADER_SRCDIR #endif #include "iface_header_builddir.h" #ifndef IFACE_HEADER_BUILDDIR -#error Expected IFACE_HEADER_BUILDDIR +# error Expected IFACE_HEADER_BUILDDIR #endif extern int obj(); diff --git a/Tests/InterfaceLibrary/map_config.cpp b/Tests/InterfaceLibrary/map_config.cpp index 232a18e..d035632 100644 --- a/Tests/InterfaceLibrary/map_config.cpp +++ b/Tests/InterfaceLibrary/map_config.cpp @@ -1,12 +1,12 @@ #ifdef DEBUG_MODE -#ifndef SPECIAL_MODE -#error Special configuration should be mapped to debug configuration. -#endif +# ifndef SPECIAL_MODE +# error Special configuration should be mapped to debug configuration. +# endif #else -#ifdef SPECIAL_MODE -#error Special configuration should not be enabled if not debug configuration -#endif +# ifdef SPECIAL_MODE +# error Special configuration should not be enabled if not debug configuration +# endif #endif int main(int, char**) diff --git a/Tests/InterfaceLibrary/sharedlibtestexe.cpp b/Tests/InterfaceLibrary/sharedlibtestexe.cpp index 44f160d..97b5aa9 100644 --- a/Tests/InterfaceLibrary/sharedlibtestexe.cpp +++ b/Tests/InterfaceLibrary/sharedlibtestexe.cpp @@ -1,14 +1,14 @@ #ifndef SHAREDLIB_DEFINE -#error Expected SHAREDLIB_DEFINE +# error Expected SHAREDLIB_DEFINE #endif #ifndef SHAREDDEPENDLIB_DEFINE -#error Expected SHAREDDEPENDLIB_DEFINE +# error Expected SHAREDDEPENDLIB_DEFINE #endif -#include "sharedlib.h" #include "shareddependlib.h" +#include "sharedlib.h" int main(int, char**) { |