Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv9831/Include/SimData
Modified Files:
Tag: simdata
DataArchive.h Enum.h GlibCsp.h
Log Message:
more hash_map and endian (temp) fix for win32
Index: DataArchive.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Attic/DataArchive.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
*** DataArchive.h 19 Jan 2003 20:28:29 -0000 1.1.2.1
--- DataArchive.h 20 Jan 2003 04:29:38 -0000 1.1.2.2
***************
*** 30,35 ****
#include <stdio.h>
#include <stdlib.h>
- #include <endian.h>
- #include <hash_map.h>
#include <SimData/Object.h>
#include <SimData/Path.h>
--- 30,33 ----
Index: Enum.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Attic/Enum.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
*** Enum.h 19 Jan 2003 20:28:30 -0000 1.1.2.1
--- Enum.h 20 Jan 2003 04:29:38 -0000 1.1.2.2
***************
*** 30,34 ****
#include <string>
#include <vector>
! #include <hash_map.h>
#include <SimData/BaseType.h>
--- 30,34 ----
#include <string>
#include <vector>
! #include <SimData/hash_map.h>
#include <SimData/BaseType.h>
***************
*** 75,79 ****
} // namespace
! typedef hash_map<const std::string, int, hashstring, eqstring> string_map;
--- 75,79 ----
} // namespace
! typedef std::hash_map<const std::string, int, hashstring, eqstring> string_map;
Index: GlibCsp.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Attic/GlibCsp.h,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** GlibCsp.h 20 Jan 2003 04:10:47 -0000 1.1.2.2
--- GlibCsp.h 20 Jan 2003 04:29:38 -0000 1.1.2.3
***************
*** 177,180 ****
--- 177,187 ----
#define G_PDP_ENDIAN 3412 /* unused, need specific PDP check */
+ /* FIXME */
+ #ifdef NATIVE_WIN32
+ #define G_BYTE_ORDER G_LITTLE_ENDIAN
+ #else
+ #define G_BYTE_ORDER G_LITTLE_ENDIAN
+ #endif
+
/* Basic bit swapping functions
|
