[Csp-commits] APPLICATIONS/SimData/Include/SimData hash_map.h,1.5,1.6 HashUtility.h,1.11,1.12

[<bra...@us...>]

Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv31539

Modified Files:
	hash_map.h HashUtility.h 
Log Message:
Updated the MSVC version constants to be >= 1300 so the code would compile on MSVC 2003

Index: hash_map.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/hash_map.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** hash_map.h	12 Apr 2003 08:56:38 -0000	1.5
--- hash_map.h	18 Jul 2003 01:33:53 -0000	1.6
***************
*** 49,53 ****
      #define HASH_MAP std::hash_map
      #define HASH std::hash
!   #elif (_MSC_VER == 1300) 
      #include <hash_map>
      #define HASH_MAP std::hash_map
--- 49,53 ----
      #define HASH_MAP std::hash_map
      #define HASH std::hash
!   #elif (_MSC_VER >= 1300) 
      #include <hash_map>
      #define HASH_MAP std::hash_map
***************
*** 60,64 ****
  
  template <class key, class val, class hash, class eq> struct HASH_MAPS {
! #if defined(_MSC_VER) && (_MSC_VER == 1300)
  	typedef HASH_MAP<key, val, eq> Type;
  #else
--- 60,64 ----
  
  template <class key, class val, class hash, class eq> struct HASH_MAPS {
! #if defined(_MSC_VER) && (_MSC_VER >= 1300)
  	typedef HASH_MAP<key, val, eq> Type;
  #else

Index: HashUtility.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/HashUtility.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** HashUtility.h	4 May 2003 10:57:48 -0000	1.11
--- HashUtility.h	18 Jul 2003 01:33:53 -0000	1.12
***************
*** 126,130 ****
  
  
! #if defined(_MSC_VER) && (_MSC_VER == 1300) 
  	struct eqint: public std::hash_compare<int const> {
  		size_t operator ()(int const& i) const {
--- 126,130 ----
  
  
! #if defined(_MSC_VER) && (_MSC_VER >= 1300) 
  	struct eqint: public std::hash_compare<int const> {
  		size_t operator ()(int const& i) const {
***************
*** 150,154 ****
  
  
! #if defined(_MSC_VER) && (_MSC_VER == 1300) 
  	struct eqstr: public std::hash_compare<char const*>
  		{
--- 150,154 ----
  
  
! #if defined(_MSC_VER) && (_MSC_VER >= 1300) 
  	struct eqstr: public std::hash_compare<char const*>
  		{
***************
*** 176,180 ****
  };
  
! #if defined(_MSC_VER) && (_MSC_VER == 1300) 
  	struct hasht_eq: public std::hash_compare<hasht const> {
  		size_t operator()( hasht const& i1 ) const {
--- 176,180 ----
  };
  
! #if defined(_MSC_VER) && (_MSC_VER >= 1300) 
  	struct hasht_eq: public std::hash_compare<hasht const> {
  		size_t operator()( hasht const& i1 ) const {
***************
*** 204,208 ****
  };
  
! #if defined(_MSC_VER) && (_MSC_VER == 1300) 
  	struct eqstring: public std::hash_compare<std::string const> {
  		size_t operator()( std::string const& a ) const {
--- 204,208 ----
  };
  
! #if defined(_MSC_VER) && (_MSC_VER >= 1300) 
  	struct eqstring: public std::hash_compare<std::string const> {
  		size_t operator()( std::string const& a ) const {