[Csp-commits] APPLICATIONS/SimData/Include/SimData BaseType.h,1.2,1.3 DataArchive.h,1.2,1.3 Exception.h,1.2,1.3 HashUtility.h,1.2,1.3 InterfaceRegistry.h,1.5,1.6 Matrix3.h,1.2,1.3 Object.h,1.3,1.4 ObjectInterface.h,1.3,1.4 Quaternion.h,1.2,1.3 TypeAdapter.h,1.2,1.3

[<de...@us...>]

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

Modified Files:
	BaseType.h DataArchive.h Exception.h HashUtility.h 
	InterfaceRegistry.h Matrix3.h Object.h ObjectInterface.h 
	Quaternion.h TypeAdapter.h 
Log Message:
no message

Index: BaseType.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/BaseType.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** BaseType.h	28 Jan 2003 23:26:05 -0000	1.2
--- BaseType.h	30 Jan 2003 22:41:02 -0000	1.3
***************
*** 25,28 ****
--- 25,30 ----
  #include <string>
  #include <iostream>
+ 
+ #include <SimData/Export.h>
  #include <SimData/ns-simdata.h>
  #include <SimData/Exception.h>
***************
*** 43,47 ****
   * @author Mark Rose <mr...@st...>
   */
! class BaseType {
  public:
  	/**
--- 45,49 ----
   * @author Mark Rose <mr...@st...>
   */
! class SIMDATA_EXPORT BaseType {
  public:
  	/**

Index: DataArchive.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/DataArchive.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DataArchive.h	28 Jan 2003 23:26:05 -0000	1.2
--- DataArchive.h	30 Jan 2003 22:41:02 -0000	1.3
***************
*** 30,33 ****
--- 30,34 ----
  #include <stdio.h>
  #include <stdlib.h>
+ 
  #include <SimData/Object.h>
  #include <SimData/Path.h>

Index: Exception.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Exception.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Exception.h	28 Jan 2003 23:26:06 -0000	1.2
--- Exception.h	30 Jan 2003 22:41:03 -0000	1.3
***************
*** 29,32 ****
--- 29,34 ----
  
  #include <string>
+ 
+ #include <SimData/Export.h>
  #include <SimData/ns-simdata.h>
  

Index: HashUtility.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/HashUtility.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** HashUtility.h	28 Jan 2003 23:26:06 -0000	1.2
--- HashUtility.h	30 Jan 2003 22:41:03 -0000	1.3
***************
*** 31,34 ****
--- 31,35 ----
  #include <string>
  #include <iostream>
+ #include <SimData/Export.h>
  #include <SimData/hash_map.h>
  #include <SimData/GlibCsp.h>

Index: InterfaceRegistry.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/InterfaceRegistry.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** InterfaceRegistry.h	29 Jan 2003 13:55:43 -0000	1.5
--- InterfaceRegistry.h	30 Jan 2003 22:41:03 -0000	1.6
***************
*** 31,34 ****
--- 31,35 ----
  #include <vector>
  
+ #include <SimData/Export.h>
  #include <SimData/HashUtility.h>
  #include <SimData/TypeAdapter.h>
***************
*** 170,175 ****
   * The master interface registry.
   */
  extern InterfaceRegistry g_InterfaceRegistry;
! 
  
  //-------------------------------------------------------
--- 171,179 ----
   * The master interface registry.
   */
+ #ifdef _WIN32
  extern InterfaceRegistry g_InterfaceRegistry;
! #else
! extern InterfaceRegistry g_InterfaceRegistry;
! #endif
  
  //-------------------------------------------------------
***************
*** 212,216 ****
  	virtual bool isVirtual() const { return true; }
  
! #ifdef _WIN32
  	#define CTOR_INIT(a, b) b
  #else
--- 216,220 ----
  	virtual bool isVirtual() const { return true; }
  
! #ifdef _MSC_VER
  	#define CTOR_INIT(a, b) b
  #else
***************
*** 273,278 ****
  		(*_interface)
  
- 		//CTOR_INIT(baseinterface,InterfaceProxy)(cname, chash) 
- 		//baseinterface::InterfaceProxy(cname, chash)
  //-----------------------------------------
  
--- 277,280 ----
***************
*** 299,307 ****
  #else
  	#define EXTEND_SIMDATA_XML_INTERFACE(classname, basename) \
! 		__SIMDATA_XML_INTERFACE_0(classname, basename::basename##InterfaceProxy) \
  		__SIMDATA_XML_INTERFACE_1(classname) \
  		__SIMDATA_XML_INTERFACE_2(classname, basename::basename##InterfaceProxy, basename##InterfaceProxy) 
  	#define EXTEND_SIMDATA_XML_VIRTUAL_INTERFACE(classname, basename) \
! 		__SIMDATA_XML_INTERFACE_0(classname, basename::basename##InterfaceProxy) \
  		__SIMDATA_XML_INTERFACE_V(classname) \
  		__SIMDATA_XML_INTERFACE_2(classname, basename::basename##InterfaceProxy, basename##InterfaceProxy)
--- 301,310 ----
  #else
  	#define EXTEND_SIMDATA_XML_INTERFACE(classname, basename) \
! 	    __SIMDATA_XML_INTERFACE_0(classname, basename::basename##InterfaceProxy) \
  		__SIMDATA_XML_INTERFACE_1(classname) \
  		__SIMDATA_XML_INTERFACE_2(classname, basename::basename##InterfaceProxy, basename##InterfaceProxy) 
+ 
  	#define EXTEND_SIMDATA_XML_VIRTUAL_INTERFACE(classname, basename) \
! 	    __SIMDATA_XML_INTERFACE_0(classname, basename::basename##InterfaceProxy) \
  		__SIMDATA_XML_INTERFACE_V(classname) \
  		__SIMDATA_XML_INTERFACE_2(classname, basename::basename##InterfaceProxy, basename##InterfaceProxy)

Index: Matrix3.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Matrix3.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Matrix3.h	28 Jan 2003 23:26:06 -0000	1.2
--- Matrix3.h	30 Jan 2003 22:41:03 -0000	1.3
***************
*** 32,35 ****
--- 32,37 ----
  #include <vector>
  #include <cstdio>
+ 
+ #include <SimData/Export.h>
  #include <SimData/BaseType.h>
  

Index: Object.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Object.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Object.h	28 Jan 2003 23:52:28 -0000	1.3
--- Object.h	30 Jan 2003 22:41:03 -0000	1.4
***************
*** 31,34 ****
--- 31,36 ----
  #include <assert.h>
  #include <string>
+ 
+ #include <SimData/Export.h>
  #include <SimData/HashUtility.h>
  #include <SimData/Pack.h>

Index: ObjectInterface.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/ObjectInterface.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ObjectInterface.h	28 Jan 2003 23:30:36 -0000	1.3
--- ObjectInterface.h	30 Jan 2003 22:41:03 -0000	1.4
***************
*** 65,69 ****
   */
  
! #ifdef WIN32 
  	#define __PTS_SIM__
  #endif
--- 65,69 ----
   */
  
! #ifdef _WIN32 
  	#define __PTS_SIM__
  #endif

Index: Quaternion.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/Quaternion.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Quaternion.h	28 Jan 2003 23:26:06 -0000	1.2
--- Quaternion.h	30 Jan 2003 22:41:04 -0000	1.3
***************
*** 46,49 ****
--- 46,50 ----
  #include <iostream>
  
+ #include <SimData/Export.h>
  #include <SimData/Matrix3.h>
  #include <SimData/ns-simdata.h>

Index: TypeAdapter.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/TypeAdapter.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** TypeAdapter.h	28 Jan 2003 23:26:06 -0000	1.2
--- TypeAdapter.h	30 Jan 2003 22:41:05 -0000	1.3
***************
*** 35,38 ****
--- 35,39 ----
  #include <iostream>
  
+ #include <SimData/Export.h>
  #include <SimData/Exception.h>
  #include <SimData/ns-simdata.h>