[Csp-commits] svn:csp r1762 - trunk/CSP/csp/csplib/util

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

Author: mkrose
Date: 2005-12-11 11:17:16 -0800 (Sun, 11 Dec 2005)
New Revision: 1762

Modified:
   trunk/CSP/csp/csplib/util/Dispatch.h
   trunk/CSP/csp/csplib/util/LocalUpdate.h
   trunk/CSP/csp/csplib/util/Modules.h
   trunk/CSP/csp/csplib/util/SimpleConfig.h
   trunk/CSP/csp/csplib/util/SynchronousUpdate.h
Log:
More import/export fixes for windows.

Browse at: https://www.zerobar.net/viewcvs/viewcvs.cgi?view=rev&rev=1762

Modified: trunk/CSP/csp/csplib/util/Dispatch.h
===================================================================
--- trunk/CSP/csp/csplib/util/Dispatch.h	2005-12-11 19:03:29 UTC (rev 1761)
+++ trunk/CSP/csp/csplib/util/Dispatch.h	2005-12-11 19:17:16 UTC (rev 1762)
@@ -66,7 +66,9 @@
 #define __CSPLIB_UTIL_DISPATCH_H__
 
 
+#include <csp/csplib/util/Export.h>
 #include <csp/csplib/util/Namespace.h>
+// TODO move to net (util/* shouldn't depend on net/*)
 #include <csp/csplib/net/TaggedRecord.h>
 
 CSP_NAMESPACE
@@ -92,7 +94,7 @@
  *  Inherit from this class and use the MESSAGE_DISPATCH macros to
  *  bind handlers to specific message types.
  */
-class MessageDispatcher {
+class CSPLIB_EXPORT MessageDispatcher {
 
 public:
 	virtual bool dispatchMessage(Ref<TaggedRecord> const &record) {

Modified: trunk/CSP/csp/csplib/util/LocalUpdate.h
===================================================================
--- trunk/CSP/csp/csplib/util/LocalUpdate.h	2005-12-11 19:03:29 UTC (rev 1761)
+++ trunk/CSP/csp/csplib/util/LocalUpdate.h	2005-12-11 19:17:16 UTC (rev 1762)
@@ -25,6 +25,7 @@
 #ifndef __CSPLIB_UTIL_LOCALUPDATE_H__
 #define __CSPLIB_UTIL_LOCALUPDATE_H__
 
+#include <csp/csplib/util/Export.h>
 #include <csp/csplib/util/Namespace.h>
 #include <vector>
 #include <sigc++/slot.h>
@@ -80,7 +81,7 @@
  *  };
  *  @endcode
  */
-class LocalUpdate {
+class CSPLIB_EXPORT LocalUpdate {
 public:
 	LocalUpdate(): m_Time(0), m_Next(0) { }
 	~LocalUpdate();

Modified: trunk/CSP/csp/csplib/util/Modules.h
===================================================================
--- trunk/CSP/csp/csplib/util/Modules.h	2005-12-11 19:03:29 UTC (rev 1761)
+++ trunk/CSP/csp/csplib/util/Modules.h	2005-12-11 19:17:16 UTC (rev 1762)
@@ -25,6 +25,7 @@
 #ifndef __CSPLIB_UTIL_MODULES_H__
 #define __CSPLIB_UTIL_MODULES_H__
 
+#include <csp/csplib/util/Export.h>
 #include <csp/csplib/util/Namespace.h>
 #include <csp/csplib/util/Properties.h>
 #include <string>
@@ -34,7 +35,7 @@
 /** Interface for loading shared libraries at runtime.  Works only on systems
  *  that support dynamic loading.
  */
-class ModuleLoader: public NonConstructable {
+class CSPLIB_EXPORT ModuleLoader: public NonConstructable {
 public:
 
 	/** Load a new module from the specified path.  Returns true on success.

Modified: trunk/CSP/csp/csplib/util/SimpleConfig.h
===================================================================
--- trunk/CSP/csp/csplib/util/SimpleConfig.h	2005-12-11 19:03:29 UTC (rev 1761)
+++ trunk/CSP/csp/csplib/util/SimpleConfig.h	2005-12-11 19:17:16 UTC (rev 1762)
@@ -39,6 +39,7 @@
 #include <iostream>
 #include <fstream>
 
+#include <csp/csplib/util/Export.h>
 #include <csp/csplib/util/HashUtility.h>
 
 CSP_NAMESPACE
@@ -49,7 +50,7 @@
  * The error message will automatically be dumped to stderr when the object
  * is destroyed unless the clear() method is called.
  */
-class Error {
+class CSPLIB_EXPORT Error {
 public:
 	/**
 	 * Set the error message.
@@ -62,9 +63,7 @@
 	 * Maybe a little too fancy, but the clear() is needed so that
 	 * multiple automatic copies yield only a single error message.
 	 */
-	Error(const Error &e): m_msg(e.m_msg),
-	                       m_fullerror(e.m_fullerror),
-			       m_display(e.m_display) { e.clear(); }
+	Error(const Error &e): m_msg(e.m_msg), m_fullerror(e.m_fullerror), m_display(e.m_display) { e.clear(); }
 	
 	/**
 	 * Display the error message on stderr unless clear() has been called.
@@ -99,7 +98,7 @@
 /**
  * Thrown by SimpleConfig to report errors.
  */
-class ConfigError: public Error {
+class CSPLIB_EXPORT ConfigError: public Error {
 public:
 	/**
 	 * Set the error information.
@@ -143,7 +142,7 @@
  * This will often be created as a global object so that configuration
  * data can be accessed and saved throughout the program.
  */
-class SimpleConfig {
+class CSPLIB_EXPORT SimpleConfig {
 public:
 	
 	/**

Modified: trunk/CSP/csp/csplib/util/SynchronousUpdate.h
===================================================================
--- trunk/CSP/csp/csplib/util/SynchronousUpdate.h	2005-12-11 19:03:29 UTC (rev 1761)
+++ trunk/CSP/csp/csplib/util/SynchronousUpdate.h	2005-12-11 19:17:16 UTC (rev 1762)
@@ -27,6 +27,7 @@
 #define __CSPLIB_UTIL_SYNCHRONOUSUPDATE_H__
 
 
+#include <csp/csplib/util/Export.h>
 #include <csp/csplib/util/Namespace.h>
 #include <csp/csplib/util/Ref.h>