diff options
author | Brad King <brad.king@kitware.com> | 2018-06-04 13:45:24 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2018-06-04 13:45:56 (GMT) |
commit | 5a9a3d28a4a29124c61a42217780f57adcbcbae2 (patch) | |
tree | bda5926a31bca882adfb8742a902031df1d18cd4 /Source/kwsys/testEncoding.cxx | |
parent | f70da4ed836fa40572d2db393b4bf24a87ba3a87 (diff) | |
parent | 81870f1159a7b2649b027a6c3f75eba555831488 (diff) | |
download | CMake-5a9a3d28a4a29124c61a42217780f57adcbcbae2.zip CMake-5a9a3d28a4a29124c61a42217780f57adcbcbae2.tar.gz CMake-5a9a3d28a4a29124c61a42217780f57adcbcbae2.tar.bz2 |
Merge topic 'update-kwsys'
81870f1159 Merge branch 'upstream-KWSys' into update-kwsys
3af8c7715b KWSys 2018-06-01 (8ef62b28)
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2125
Diffstat (limited to 'Source/kwsys/testEncoding.cxx')
-rw-r--r-- | Source/kwsys/testEncoding.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/kwsys/testEncoding.cxx b/Source/kwsys/testEncoding.cxx index 6bf273f..fdad1cd 100644 --- a/Source/kwsys/testEncoding.cxx +++ b/Source/kwsys/testEncoding.cxx @@ -3,7 +3,7 @@ #include "kwsysPrivate.h" #if defined(_MSC_VER) -#pragma warning(disable : 4786) +# pragma warning(disable : 4786) #endif #include KWSYS_HEADER(Encoding.hxx) @@ -18,8 +18,8 @@ // Work-around CMake dependency scanning limitation. This must // duplicate the above list of headers. #if 0 -#include "Encoding.h.in" -#include "Encoding.hxx.in" +# include "Encoding.h.in" +# include "Encoding.hxx.in" #endif static const unsigned char helloWorldStrings[][32] = { |