diff options
| author | KWSys Upstream <kwrobot@kitware.com> | 2016-11-09 14:12:29 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-11-09 14:22:56 (GMT) |
| commit | 773b36e5d4af3ac040625e0ea16bcfd30fcdeb6d (patch) | |
| tree | bd409d3f09f6714981a444e896e1bc08e22ee184 /kwsysPrivate.h | |
| parent | 53862f04a0002894c0ef5aeb23d52495e5abe60d (diff) | |
| download | CMake-773b36e5d4af3ac040625e0ea16bcfd30fcdeb6d.zip CMake-773b36e5d4af3ac040625e0ea16bcfd30fcdeb6d.tar.gz CMake-773b36e5d4af3ac040625e0ea16bcfd30fcdeb6d.tar.bz2 | |
KWSys 2016-11-09 (18c65411)
Code extracted from:
http://public.kitware.com/KWSys.git
at commit 18c654114de3aa65429542f95308720bc68f9231 (master).
Upstream Shortlog
-----------------
Brad King (14):
37306a1c FStream: Quiet unused argument warning
15e90a3c Sort includes to stabilize include order w.r.t. clang-format
26509227 Copyright.txt: Add notice of copyright by contributors
fc42d3f2 Add temporary script to filter license notices
c41c1bc4 Simplify KWSys per-source license notices
1d4c0b4a Remove temporary script that filtered license notices
a4f5ef79 SystemInformation: Remove stray comment
8649a886 kwsysPrivate: Protect KWSYS_HEADER macro from clang-format
89b98af5 Configure clang-format for KWSys source tree
547dacad Add a script to run clang-format on the entire source tree
aa94be0c CONTRIBUTING: Add a section on coding style
6604c4b6 Empty commit at end of history preceding clang-format style transition
2b3e2b1c Tell Git to not export 'clang-format' infrastructure
18c65411 FStream: Include Configure.hxx before other headers
Kitware Robot (1):
6c973b46 Revise C++ coding style using clang-format
Diffstat (limited to 'kwsysPrivate.h')
| -rw-r--r-- | kwsysPrivate.h | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/kwsysPrivate.h b/kwsysPrivate.h index 3a26c26..ce1b53e 100644 --- a/kwsysPrivate.h +++ b/kwsysPrivate.h @@ -1,16 +1,7 @@ -/*============================================================================ - KWSys - Kitware System Library - Copyright 2000-2009 Kitware, Inc., Insight Software Consortium - - Distributed under the OSI-approved BSD License (the "License"); - see accompanying file Copyright.txt for details. - - This software is distributed WITHOUT ANY WARRANTY; without even the - implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - See the License for more information. -============================================================================*/ +/* Distributed under the OSI-approved BSD 3-Clause License. See accompanying + file Copyright.txt or https://cmake.org/licensing#kwsys for details. */ #ifndef KWSYS_NAMESPACE -# error "Do not include kwsysPrivate.h outside of kwsys c and cxx files." +#error "Do not include kwsysPrivate.h outside of kwsys c and cxx files." #endif #ifndef _kwsysPrivate_h @@ -24,7 +15,9 @@ #include KWSYS_HEADER(Directory.hxx) #include KWSYS_HEADER(std/vector) */ +/* clang-format off */ #define KWSYS_HEADER(x) KWSYS_HEADER0(KWSYS_NAMESPACE/x) +/* clang-format on */ #define KWSYS_HEADER0(x) KWSYS_HEADER1(x) #define KWSYS_HEADER1(x) <x> @@ -37,5 +30,5 @@ #define KWSYS_NAMESPACE_STRING1(x) #x #else -# error "kwsysPrivate.h included multiple times." +#error "kwsysPrivate.h included multiple times." #endif |