diff options
author | Kitware Robot <kwrobot@kitware.com> | 2018-06-01 13:53:41 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2018-06-01 13:53:42 (GMT) |
commit | d7204e649ed4ebb19bb341b4e49eb51514364922 (patch) | |
tree | d9ac3ded5ae6899be7188795011743fe3e6da0a6 /Source/cmStandardLexer.h | |
parent | 12fed3edb107c949671043196fa94c542b45452a (diff) | |
download | CMake-d7204e649ed4ebb19bb341b4e49eb51514364922.zip CMake-d7204e649ed4ebb19bb341b4e49eb51514364922.tar.gz CMake-d7204e649ed4ebb19bb341b4e49eb51514364922.tar.bz2 |
Revise C++ coding style using clang-format-6.0
Run the `clang-format.bash` script to update all our C and C++ code to a
new style defined by `.clang-format`. Use `clang-format` version 6.0.
* If you reached this commit for a line in `git blame`, re-run the blame
operation starting at the parent of this commit to see older history
for the content.
* See the parent commit for instructions to rebase a change across this
style transition commit.
Diffstat (limited to 'Source/cmStandardLexer.h')
-rw-r--r-- | Source/cmStandardLexer.h | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/Source/cmStandardLexer.h b/Source/cmStandardLexer.h index b212c7e..13f7622 100644 --- a/Source/cmStandardLexer.h +++ b/Source/cmStandardLexer.h @@ -7,41 +7,41 @@ /* Disable some warnings. */ #if defined(_MSC_VER) -#pragma warning(disable : 4018) -#pragma warning(disable : 4127) -#pragma warning(disable : 4131) -#pragma warning(disable : 4244) -#pragma warning(disable : 4251) -#pragma warning(disable : 4267) -#pragma warning(disable : 4305) -#pragma warning(disable : 4309) -#pragma warning(disable : 4706) -#pragma warning(disable : 4786) +# pragma warning(disable : 4018) +# pragma warning(disable : 4127) +# pragma warning(disable : 4131) +# pragma warning(disable : 4244) +# pragma warning(disable : 4251) +# pragma warning(disable : 4267) +# pragma warning(disable : 4305) +# pragma warning(disable : 4309) +# pragma warning(disable : 4706) +# pragma warning(disable : 4786) #endif #if defined(__GNUC__) && !defined(__INTEL_COMPILER) -#if ((__GNUC__ * 100) + __GNUC_MINOR__) >= 402 -#pragma GCC diagnostic ignored "-Wconversion" -#pragma GCC diagnostic ignored "-Wsign-compare" -#endif -#if ((__GNUC__ * 100) + __GNUC_MINOR__) >= 403 -#pragma GCC diagnostic ignored "-Wsign-conversion" -#endif +# if ((__GNUC__ * 100) + __GNUC_MINOR__) >= 402 +# pragma GCC diagnostic ignored "-Wconversion" +# pragma GCC diagnostic ignored "-Wsign-compare" +# endif +# if ((__GNUC__ * 100) + __GNUC_MINOR__) >= 403 +# pragma GCC diagnostic ignored "-Wsign-conversion" +# endif #endif /* Make sure isatty is available. */ #if defined(_WIN32) && !defined(__CYGWIN__) -#include <io.h> -#if defined(_MSC_VER) -#define isatty _isatty -#endif +# include <io.h> +# if defined(_MSC_VER) +# define isatty _isatty +# endif #else -#include <unistd.h> // IWYU pragma: export +# include <unistd.h> // IWYU pragma: export #endif /* Make sure malloc and free are available on QNX. */ #ifdef __QNX__ -#include <malloc.h> +# include <malloc.h> #endif /* Disable features we do not need. */ |