[Csp-commits] APPLICATIONS/SimData/Include/SimData hash_map.h,NONE,1.1.2.1 HashUtility.h,1.1.2.1,1.1.2.2 ObjectInterface.h,1.1.2.1,1.1.2.2

[<mk...@us...>]

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

Modified Files:
      Tag: simdata
	HashUtility.h ObjectInterface.h 
Added Files:
      Tag: simdata
	hash_map.h 
Log Message:
hash_map.h win32 fix

--- NEW FILE: hash_map.h ---
#ifdef __GNUC__
  #if __GNUC__ == 3
    #include <backward/hash_map.h>
  #else
    #include <hash_map>
  #endif
#else
  #ifdef WIN32
    #include <backward/hash_map.h>
  #else
    #error "PLEASE PROVIDE CORRECT #INCLUDE<HASH_MAP> STATEMENT FOR YOUR PLATFORM!"
  #endif
#endif

Index: HashUtility.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Attic/HashUtility.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** HashUtility.h	19 Jan 2003 20:28:30 -0000	1.1.2.1
--- HashUtility.h	20 Jan 2003 04:14:42 -0000	1.1.2.2
***************
*** 29,33 ****
  #define __HASHUTILITY_H__
  
! #include <hash_map.h>
  #include <SimData/GlibCsp.h>
  #include <SimData/ns-simdata.h>
--- 29,33 ----
  #define __HASHUTILITY_H__
  
! #include <SimData/hash_map.h>
  #include <SimData/GlibCsp.h>
  #include <SimData/ns-simdata.h>
***************
*** 95,105 ****
  } // anonymous namespace
  
! typedef hash_map<hasht, int, hasht_hash, hasht_eq> hasht_map;
  
  class Object;
  class ObjectProxyBase;
  
! typedef hash_map<hasht, Object*, hasht_hash, hasht_eq> cache_map;
! typedef hash_map<hasht, ObjectProxyBase*, hasht_hash, hasht_eq> proxy_map;
  
  
--- 95,105 ----
  } // anonymous namespace
  
! typedef std::hash_map<hasht, int, hasht_hash, hasht_eq> hasht_map;
  
  class Object;
  class ObjectProxyBase;
  
! typedef std::hash_map<hasht, Object*, hasht_hash, hasht_eq> cache_map;
! typedef std::hash_map<hasht, ObjectProxyBase*, hasht_hash, hasht_eq> proxy_map;
  
  

Index: ObjectInterface.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Attic/ObjectInterface.h,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** ObjectInterface.h	19 Jan 2003 20:28:30 -0000	1.1.2.1
--- ObjectInterface.h	20 Jan 2003 04:14:42 -0000	1.1.2.2
***************
*** 32,45 ****
  #include <vector>
  
! #ifdef __GNUC__
!   #if __GNUC__ == 3
!     #include <backward/hash_map.h>
!   #else
!     #include <hash_map>
!   #endif
! #else
!   #error "PLEASE PROVIDE CORRECT #INCLUDE<HASH_MAP> STATEMENT FOR YOUR PLATFORM!"
! #endif
! 
  #include <SimData/TypeAdapter.h>
  #include <SimData/ns-simdata.h>
--- 32,36 ----
  #include <vector>
  
! #include <SimData/hash_map.h>
  #include <SimData/TypeAdapter.h>
  #include <SimData/ns-simdata.h>