[Csp-commits] APPLICATIONS/SimData/Include/SimData InterfaceRegistry.h,1.3,1.4

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

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

Modified Files:
	InterfaceRegistry.h 
Log Message:


Index: InterfaceRegistry.h
===================================================================
RCS file: /cvsroot/csp/APPLICATIONS/SimData/Include/SimData/InterfaceRegistry.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** InterfaceRegistry.h	29 Jan 2003 00:58:50 -0000	1.3
--- InterfaceRegistry.h	29 Jan 2003 03:52:54 -0000	1.4
***************
*** 173,177 ****
  
  
- 
  //-------------------------------------------------------
  // macros to create an interface to a specific class.
--- 173,176 ----
***************
*** 220,224 ****
  
  // interface macro 2
! #define __SIMDATA_XML_INTERFACE_2(classname, fqbaseinterface, baseinterface) \
  	virtual SIMDATA(hasht) getClassHash() const { return classname::_getClassHash(); } \
  	virtual const char * getClassName() const { return classname::_getClassName(); } \
--- 219,223 ----
  
  // interface macro 2
! #define __SIMDATA_XML_INTERFACE_2(classname, baseinterface, nqbaseinterface) \
  	virtual SIMDATA(hasht) getClassHash() const { return classname::_getClassHash(); } \
  	virtual const char * getClassName() const { return classname::_getClassName(); } \
***************
*** 227,231 ****
  		SIMDATA(MemberAccessorBase) *p = _interface->getAccessor(name); \
  		if (!p) { \
! 			return baseinterface::getAccessor(name, cname); \
  		} \
  		return p; \
--- 226,230 ----
  		SIMDATA(MemberAccessorBase) *p = _interface->getAccessor(name); \
  		if (!p) { \
! 			return nqbaseinterface::getAccessor(name, cname); \
  		} \
  		return p; \
***************
*** 268,276 ****
  	} \
  	InterfaceProxy(const char * cname = #classname, SIMDATA(hasht) (*chash)() = &classname::_getClassHash): \
! 		CTOR_INIT(fqbaseinterface,InterfaceProxy)(cname, chash) \
  	{ \
  		_interface = new SIMDATA(ObjectInterface)<classname>; \
  		(*_interface)
  
  //-----------------------------------------
  
--- 267,276 ----
  	} \
  	InterfaceProxy(const char * cname = #classname, SIMDATA(hasht) (*chash)() = &classname::_getClassHash): \
! 		CTOR_INIT(baseinterface,InterfaceProxy)(cname, chash) \
  	{ \
  		_interface = new SIMDATA(ObjectInterface)<classname>; \
  		(*_interface)
  
+ 		//baseinterface::InterfaceProxy(cname, chash)
  //-----------------------------------------
  
***************
*** 299,309 ****
  		__SIMDATA_XML_INTERFACE_0(classname, basename::InterfaceProxy) \
  		__SIMDATA_XML_INTERFACE_1(classname, basename::InterfaceProxy) \
! 		__SIMDATA_XML_INTERFACE_2(classname, basename::InterfaceProxy, InterfaceProxy) 
! 		//__SIMDATA_XML_INTERFACE_2(classname, basename::InterfaceProxy, basename::InterfaceProxy) 
  	#define EXTEND_SIMDATA_XML_VIRTUAL_INTERFACE(classname, basename) \
  		__SIMDATA_XML_INTERFACE_0(classname, basename::InterfaceProxy) \
  		__SIMDATA_XML_INTERFACE_V(classname, basename::InterfaceProxy) \
! 		__SIMDATA_XML_INTERFACE_2(classname, basename::InterfaceProxy, InterfaceProxy)
! 		//__SIMDATA_XML_INTERFACE_2(classname, basename::InterfaceProxy, basename::InterfaceProxy)
  #endif
  
--- 299,307 ----
  		__SIMDATA_XML_INTERFACE_0(classname, basename::InterfaceProxy) \
  		__SIMDATA_XML_INTERFACE_1(classname, basename::InterfaceProxy) \
! 		__SIMDATA_XML_INTERFACE_2(classname, basename::InterfaceProxy, basename::InterfaceProxy) 
  	#define EXTEND_SIMDATA_XML_VIRTUAL_INTERFACE(classname, basename) \
  		__SIMDATA_XML_INTERFACE_0(classname, basename::InterfaceProxy) \
  		__SIMDATA_XML_INTERFACE_V(classname, basename::InterfaceProxy) \
! 		__SIMDATA_XML_INTERFACE_2(classname, basename::InterfaceProxy, basename::InterfaceProxy)
  #endif