Sfoglia il codice sorgente

COMP: Fix warnings on VS9.

Brad King 18 anni fa
parent
commit
d2f901bebf
2 ha cambiato i file con 5 aggiunte e 5 eliminazioni
  1. 2 2
      CompileFlags.cmake
  2. 3 3
      Source/kwsys/hash_map.hxx.in

+ 2 - 2
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.*")

+ 3 - 3
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)
 {