Update of /cvsroot/csp/APPLICATIONS/SimData/Include/SimData
In directory sc8-pr-cvs1:/tmp/cvs-serv15831
Modified Files:
DataArchive.h hash_map.h
Log Message:
Index: DataArchive.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/DataArchive.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** DataArchive.h 10 Aug 2003 17:52:07 -0000 1.13
--- DataArchive.h 10 Aug 2003 18:18:42 -0000 1.14
***************
*** 53,56 ****
--- 53,57 ----
class DataManager;
class Object;
+ class InterfaceProxy;
//For SWIG (not currently used):
***************
*** 340,343 ****
--- 341,348 ----
*/
void cleanStatic();
+
+ // InterfaceProxy *getObjectInterface(ObjectID const &id) const;
+ // InterfaceProxy *getObjectInterface(std::string const &path) const;
+
// protected methods made public for Python access, don't use!
Index: hash_map.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/hash_map.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** hash_map.h 6 Aug 2003 06:36:25 -0000 1.7
--- hash_map.h 10 Aug 2003 18:18:43 -0000 1.8
***************
*** 49,56 ****
#define HASH_MAP std::hash_map
#define HASH std::hash
! #elif (_MSC_VER >= 1300)
#include <hash_map>
#define HASH_MAP std::hash_map
#define HASH std::hash_compare
#endif
#else
--- 49,60 ----
#define HASH_MAP std::hash_map
#define HASH std::hash
! #elif (_MSC_VER == 1300)
#include <hash_map>
#define HASH_MAP std::hash_map
#define HASH std::hash_compare
+ #elif (_MSC_VER > 1300)
+ #include <hash_map>
+ #define HASH_MAP stdext::hash_map
+ #define HASH stdext::hash_compare
#endif
#else
|
