diff options
| -rw-r--r-- | CompileFlags.cmake | 4 | ||||
| -rw-r--r-- | Source/kwsys/hash_map.hxx.in | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/CompileFlags.cmake b/CompileFlags.cmake index 15e5520..59f335d 100644 --- a/CompileFlags.cmake +++ b/CompileFlags.cmake @@ -10,9 +10,9 @@ ENDIF(CMAKE_GENERATOR MATCHES "Visual Studio 6") INCLUDE (${CMAKE_ROOT}/Modules/CMakeBackwardCompatibilityCXX.cmake) # Disable deprecation warnings for standard C functions. -IF(CMAKE_COMPILER_2005) +IF(MSVC80 OR MSVC90) ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE) -ENDIF(CMAKE_COMPILER_2005) +ENDIF(MSVC80 OR MSVC90) #silence duplicate symbol warnings on AIX IF(CMAKE_SYSTEM MATCHES "AIX.*") diff --git a/Source/kwsys/hash_map.hxx.in b/Source/kwsys/hash_map.hxx.in index 78d47cb..ea1e309 100644 --- a/Source/kwsys/hash_map.hxx.in +++ b/Source/kwsys/hash_map.hxx.in @@ -236,7 +236,7 @@ public: }; template <class _Key, class _Tp, class _HashFcn, class _EqlKey, class _Alloc> -inline bool +bool operator==(const hash_map<_Key,_Tp,_HashFcn,_EqlKey,_Alloc>& __hm1, const hash_map<_Key,_Tp,_HashFcn,_EqlKey,_Alloc>& __hm2) { @@ -267,7 +267,7 @@ template <class _Key, class _Tp, class hash_multimap; template <class _Key, class _Tp, class _HF, class _EqKey, class _Alloc> -inline bool +bool operator==(const hash_multimap<_Key,_Tp,_HF,_EqKey,_Alloc>& __hm1, const hash_multimap<_Key,_Tp,_HF,_EqKey,_Alloc>& __hm2); @@ -427,7 +427,7 @@ public: }; template <class _Key, class _Tp, class _HF, class _EqKey, class _Alloc> -inline bool +bool operator==(const hash_multimap<_Key,_Tp,_HF,_EqKey,_Alloc>& __hm1, const hash_multimap<_Key,_Tp,_HF,_EqKey,_Alloc>& __hm2) { |