diff options
author | Brad King <brad.king@kitware.com> | 2018-06-01 16:54:13 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2018-06-01 16:54:13 (GMT) |
commit | 81870f1159a7b2649b027a6c3f75eba555831488 (patch) | |
tree | 05eb767f2f2becb6480cfe348d08ebca4e1fc1cf /Source/kwsys/testHashSTL.cxx | |
parent | eed0df951d95d48e7856107175a2baba212c3206 (diff) | |
parent | 3af8c7715b359affce99c575bdcb84ca87585bb2 (diff) | |
download | CMake-81870f1159a7b2649b027a6c3f75eba555831488.zip CMake-81870f1159a7b2649b027a6c3f75eba555831488.tar.gz CMake-81870f1159a7b2649b027a6c3f75eba555831488.tar.bz2 |
Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
KWSys 2018-06-01 (8ef62b28)
Diffstat (limited to 'Source/kwsys/testHashSTL.cxx')
-rw-r--r-- | Source/kwsys/testHashSTL.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/Source/kwsys/testHashSTL.cxx b/Source/kwsys/testHashSTL.cxx index 0444874..4ed2f89 100644 --- a/Source/kwsys/testHashSTL.cxx +++ b/Source/kwsys/testHashSTL.cxx @@ -7,18 +7,19 @@ // Work-around CMake dependency scanning limitation. This must // duplicate the above list of headers. #if 0 -#include "hash_map.hxx.in" -#include "hash_set.hxx.in" +# include "hash_map.hxx.in" +# include "hash_set.hxx.in" #endif #include <iostream> #if defined(_MSC_VER) -#pragma warning(disable : 4786) +# pragma warning(disable : 4786) #endif #if defined(__sgi) && !defined(__GNUC__) -#pragma set woff 1468 /* inline function cannot be explicitly instantiated */ +# pragma set woff 1468 /* inline function cannot be explicitly instantiated \ + */ #endif template class kwsys::hash_map<const char*, int>; |