[Csp-commits] svn:csp r1009 - in trunk/CSP/SimData: . Include/SimData

[<sv...@ww...>]

Author: mkrose
Date: 2004-06-11 21:06:11 -0700 (Fri, 11 Jun 2004)
New Revision: 1009

Modified:
   trunk/CSP/SimData/CHANGES.current
   trunk/CSP/SimData/Include/SimData/InterfaceRegistry.h
Log:
Move a static initializer out of an anonymous namespace to make
vc happy.  Update CHANGES.current.

Modified: trunk/CSP/SimData/CHANGES.current
===================================================================
--- trunk/CSP/SimData/CHANGES.current	2004-06-12 03:23:19 UTC (rev 1008)
+++ trunk/CSP/SimData/CHANGES.current	2004-06-12 04:06:11 UTC (rev 1009)
@@ -2,6 +2,17 @@
 ===========================
 
 2004-06-11: onsight
+  * Fixed up the ArchiveTest to use ArchiveReader and ArchiveWriter,
+    and also changed the import statements in the test suite a bit.
+    Should be slightly cleaner now, but more importantly the tests
+    should run against the local copy of SimData rather than the
+    one installed in site-packages (if any).
+
+  * Move the static initializer for object interface pointers
+    outside of the anonymous namespace that encloses the interface
+    instance declaration.  Should fix compile problems under VC.
+
+2004-06-11: onsight
   * Major refactoring of object and basetype serialization.  Archive,
     Packer, and UnPacker are replaced by Reader and Writer abstract
     classes, and ArchiveReader and ArchiveWriter subclasses.  The

Modified: trunk/CSP/SimData/Include/SimData/InterfaceRegistry.h
===================================================================
--- trunk/CSP/SimData/Include/SimData/InterfaceRegistry.h	2004-06-12 03:23:19 UTC (rev 1008)
+++ trunk/CSP/SimData/Include/SimData/InterfaceRegistry.h	2004-06-12 04:06:11 UTC (rev 1009)
@@ -303,25 +303,7 @@
 	 */
 	virtual bool isStatic() const { return false; }
 
-#if 0
-	/**
-	 * XXX write me!
-	 */
-	void pack(Object *o, Packer &p) {
-		InterfaceList::const_iterator it = _interfaces.begin();
-		for (; it != _interfaces.end(); ++it) (*it)->pack(o, p);
-	}
 
-	/**
-	 * XXX write me!
-	 */
-	void unpack(Object *o, UnPacker &p) {
-		InterfaceList::const_iterator it = _interfaces.begin();
-		for (; it != _interfaces.end(); ++it) (*it)->unpack(o, p);
-	}
-#endif
-
-
 /////////////////////////////////////////////////////// SWIG
 #ifdef SWIG
 public:
@@ -748,8 +730,8 @@
  *  See @ref InterfaceMacros for details.
  */
 #define SIMDATA_REGISTER_INTERFACE(classname) \
-namespace { \
 	SIMDATA(ObjectInterface)<classname> *classname::classname##InterfaceProxy::_interface = 0; \
+namespace { \
 	classname::classname##InterfaceProxy __##classname##_interface; \
 } /* anonymous namespace */
 
@@ -758,8 +740,8 @@
  *  See @ref InterfaceMacros for details.
  */
 #define SIMDATA_REGISTER_INNER_INTERFACE(prefix, classname) \
-namespace { \
 	SIMDATA(ObjectInterface)<classname> *prefix::classname::classname##InterfaceProxy::_interface = 0; \
+namespace { \
 	prefix::classname::classname##InterfaceProxy __##prefix##_##classname##_interface; \
 } /* anonymous namespace */