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/hash_map.hxx.in | |
| 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/hash_map.hxx.in')
| -rw-r--r-- | Source/kwsys/hash_map.hxx.in | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/Source/kwsys/hash_map.hxx.in b/Source/kwsys/hash_map.hxx.in index 8c9b81e..5f04e9c 100644 --- a/Source/kwsys/hash_map.hxx.in +++ b/Source/kwsys/hash_map.hxx.in @@ -35,14 +35,14 @@ #include <functional> // equal_to #if defined(_MSC_VER) -#pragma warning(push) -#pragma warning(disable : 4284) -#pragma warning(disable : 4786) +# pragma warning(push) +# pragma warning(disable : 4284) +# pragma warning(disable : 4786) #endif #if defined(__sgi) && !defined(__GNUC__) && (_MIPS_SIM != _MIPS_SIM_ABI32) -#pragma set woff 1174 -#pragma set woff 1375 +# pragma set woff 1174 +# pragma set woff 1375 #endif namespace @KWSYS_NAMESPACE@ { @@ -412,12 +412,12 @@ inline void swap(hash_multimap<_Key, _Tp, _HashFcn, _EqlKey, _Alloc>& __hm1, } // namespace @KWSYS_NAMESPACE@ #if defined(__sgi) && !defined(__GNUC__) && (_MIPS_SIM != _MIPS_SIM_ABI32) -#pragma reset woff 1174 -#pragma reset woff 1375 +# pragma reset woff 1174 +# pragma reset woff 1375 #endif #if defined(_MSC_VER) -#pragma warning(pop) +# pragma warning(pop) #endif #endif |