From 3868172df25ae59bd0ecc524b782ac4734812891 Mon Sep 17 00:00:00 2001 From: Henri Herscher Date: Thu, 29 Jun 2006 16:34:29 +0000 Subject: DLL_IMPORT_EXPORT becomes DLL_IMPORT_EXPORT_ORKBASE, so that different DLLs can both import and export symbols. git-svn-id: https://oreka.svn.sourceforge.net/svnroot/oreka/trunk@286 09dcff7a-b715-0410-9601-b79a96267cd0 --- orkbasecxx/AudioCapture.h | 12 ++++++------ orkbasecxx/Config.h | 2 +- orkbasecxx/ConfigManager.h | 2 +- orkbasecxx/Filter.h | 8 ++++---- orkbasecxx/LogManager.h | 2 +- orkbasecxx/MultiThreadedServer.h | 4 ++-- orkbasecxx/Object.h | 2 +- orkbasecxx/ObjectFactory.h | 2 +- orkbasecxx/OrkBase.h | 6 +++--- orkbasecxx/OrkClient.h | 6 +++--- orkbasecxx/Utils.h | 6 +++--- orkbasecxx/messages/AsyncMessage.h | 4 ++-- orkbasecxx/messages/Message.h | 2 +- orkbasecxx/messages/SyncMessage.h | 2 +- orkbasecxx/serializers/DomSerializer.h | 4 ++-- orkbasecxx/serializers/Serializer.h | 4 ++-- orkbasecxx/serializers/SingleLineSerializer.h | 2 +- orkbasecxx/serializers/UrlSerializer.h | 2 +- 18 files changed, 36 insertions(+), 36 deletions(-) diff --git a/orkbasecxx/AudioCapture.h b/orkbasecxx/AudioCapture.h index 136c153..a81ce8b 100644 --- a/orkbasecxx/AudioCapture.h +++ b/orkbasecxx/AudioCapture.h @@ -36,7 +36,7 @@ typedef enum */ #define MEDIA_CHUNK_MARKER 0x2A2A2A2A // corresponds to "****" -class DLL_IMPORT_EXPORT AudioChunkDetails +class DLL_IMPORT_EXPORT_ORKBASE AudioChunkDetails { public: AudioChunkDetails(); @@ -56,7 +56,7 @@ public: /** * This class represents a piece of audio. */ -class DLL_IMPORT_EXPORT AudioChunk +class DLL_IMPORT_EXPORT_ORKBASE AudioChunk { public: AudioChunk(); @@ -92,7 +92,7 @@ typedef boost::shared_ptr AudioChunkRef; //========================================================== -class DLL_IMPORT_EXPORT CaptureEvent +class DLL_IMPORT_EXPORT_ORKBASE CaptureEvent { public: CaptureEvent(); @@ -167,9 +167,9 @@ typedef boost::shared_ptr CaptureEventRef; FfInvalid = 6 } FileFormatEnum; -int DLL_IMPORT_EXPORT FileFormatToEnum(CStdString& format); -CStdString DLL_IMPORT_EXPORT FileFormatToString(int formatEnum); -CStdString DLL_IMPORT_EXPORT FileFormatGetExtension(FileFormatEnum); +int DLL_IMPORT_EXPORT_ORKBASE FileFormatToEnum(CStdString& format); +CStdString DLL_IMPORT_EXPORT_ORKBASE FileFormatToString(int formatEnum); +CStdString DLL_IMPORT_EXPORT_ORKBASE FileFormatGetExtension(FileFormatEnum); #endif diff --git a/orkbasecxx/Config.h b/orkbasecxx/Config.h index f3e2fd3..adcab40 100644 --- a/orkbasecxx/Config.h +++ b/orkbasecxx/Config.h @@ -71,7 +71,7 @@ #define DELETE_FAILED_CAPTURE_FILE_DEFAULT false #define CAPTURE_PORT_FILTERS_PARAM "CapturePortFilters" -class DLL_IMPORT_EXPORT Config : public Object +class DLL_IMPORT_EXPORT_ORKBASE Config : public Object { public: Config(); diff --git a/orkbasecxx/ConfigManager.h b/orkbasecxx/ConfigManager.h index a2b9f33..538dfbf 100644 --- a/orkbasecxx/ConfigManager.h +++ b/orkbasecxx/ConfigManager.h @@ -19,7 +19,7 @@ #include "Config.h" #include "AudioCapturePlugin.h" -class DLL_IMPORT_EXPORT ConfigManager +class DLL_IMPORT_EXPORT_ORKBASE ConfigManager { public: void Initialize(); diff --git a/orkbasecxx/Filter.h b/orkbasecxx/Filter.h index fa2999a..48dc9a0 100644 --- a/orkbasecxx/Filter.h +++ b/orkbasecxx/Filter.h @@ -27,7 +27,7 @@ typedef boost::shared_ptr FilterRef; * a filter is a black box that takes media chunks as an input and produces media chunks as an output * it can be translating between two encodings (codec) or just processing the signal */ -class DLL_IMPORT_EXPORT Filter +class DLL_IMPORT_EXPORT_ORKBASE Filter { public: virtual FilterRef __CDECL__ Instanciate() = 0; @@ -44,7 +44,7 @@ public: }; //=================================================================== -class DLL_IMPORT_EXPORT AlawToPcmFilter : public Filter +class DLL_IMPORT_EXPORT_ORKBASE AlawToPcmFilter : public Filter { public: FilterRef __CDECL__ Instanciate(); @@ -63,7 +63,7 @@ private: //=================================================================== -class DLL_IMPORT_EXPORT UlawToPcmFilter : public Filter +class DLL_IMPORT_EXPORT_ORKBASE UlawToPcmFilter : public Filter { public: FilterRef __CDECL__ Instanciate(); @@ -84,7 +84,7 @@ private: /** Filter Registry */ -class DLL_IMPORT_EXPORT FilterRegistry +class DLL_IMPORT_EXPORT_ORKBASE FilterRegistry { public: static FilterRegistry* instance(); diff --git a/orkbasecxx/LogManager.h b/orkbasecxx/LogManager.h index f46f4e3..7016855 100644 --- a/orkbasecxx/LogManager.h +++ b/orkbasecxx/LogManager.h @@ -22,7 +22,7 @@ using namespace log4cxx; -class DLL_IMPORT_EXPORT OrkLogManager +class DLL_IMPORT_EXPORT_ORKBASE OrkLogManager { public: void Initialize(); diff --git a/orkbasecxx/MultiThreadedServer.h b/orkbasecxx/MultiThreadedServer.h index cefca2f..f6ea6dc 100644 --- a/orkbasecxx/MultiThreadedServer.h +++ b/orkbasecxx/MultiThreadedServer.h @@ -26,7 +26,7 @@ commands are accepted in "single line" format. one thread per connection */ -class DLL_IMPORT_EXPORT CommandLineServer : public ACE_Svc_Handler +class DLL_IMPORT_EXPORT_ORKBASE CommandLineServer : public ACE_Svc_Handler { public: virtual int open (void *); @@ -46,7 +46,7 @@ typedef ACE_Acceptor CommandLineAcceptor; Example url: http://localhost:23000/message=print&text=hello */ -class DLL_IMPORT_EXPORT HttpServer : public ACE_Svc_Handler +class DLL_IMPORT_EXPORT_ORKBASE HttpServer : public ACE_Svc_Handler { public: virtual int open (void *); diff --git a/orkbasecxx/Object.h b/orkbasecxx/Object.h index 0585d25..5674e55 100644 --- a/orkbasecxx/Object.h +++ b/orkbasecxx/Object.h @@ -31,7 +31,7 @@ typedef boost::shared_ptr ObjectRef; /** An Object is the equivalent of a Java Object */ -class DLL_IMPORT_EXPORT Object +class DLL_IMPORT_EXPORT_ORKBASE Object { public: virtual void Define(Serializer* s) = 0; diff --git a/orkbasecxx/ObjectFactory.h b/orkbasecxx/ObjectFactory.h index 52f61b7..4ebaf60 100644 --- a/orkbasecxx/ObjectFactory.h +++ b/orkbasecxx/ObjectFactory.h @@ -22,7 +22,7 @@ /** The ObjectFactory can be used to instanciate Objects based on class name. All existing Objects must be registered to the ObjectFactory at startup. */ -class DLL_IMPORT_EXPORT ObjectFactory +class DLL_IMPORT_EXPORT_ORKBASE ObjectFactory { public: void Initialize(); diff --git a/orkbasecxx/OrkBase.h b/orkbasecxx/OrkBase.h index 8872920..dc97701 100644 --- a/orkbasecxx/OrkBase.h +++ b/orkbasecxx/OrkBase.h @@ -13,11 +13,11 @@ #ifdef WIN32 #ifdef BUILD_ORKBASE - #define DLL_IMPORT_EXPORT __declspec( dllexport ) + #define DLL_IMPORT_EXPORT_ORKBASE __declspec( dllexport ) #else - #define DLL_IMPORT_EXPORT __declspec( dllimport ) + #define DLL_IMPORT_EXPORT_ORKBASE __declspec( dllimport ) #endif #else - #define DLL_IMPORT_EXPORT + #define DLL_IMPORT_EXPORT_ORKBASE #endif diff --git a/orkbasecxx/OrkClient.h b/orkbasecxx/OrkClient.h index 26e59a1..f1487dd 100644 --- a/orkbasecxx/OrkClient.h +++ b/orkbasecxx/OrkClient.h @@ -18,14 +18,14 @@ #include "messages/AsyncMessage.h" /** Abstract base class for all clients. */ -class DLL_IMPORT_EXPORT OrkClient +class DLL_IMPORT_EXPORT_ORKBASE OrkClient { public: virtual bool Execute(SyncMessage& request, AsyncMessage& response, CStdString& hostname, int tcpPort, CStdString& serviceName, int timeout = 5) = 0; }; /** Abstract base class for all clients based on http. */ -class DLL_IMPORT_EXPORT OrkHttpClient : public OrkClient +class DLL_IMPORT_EXPORT_ORKBASE OrkHttpClient : public OrkClient { public: virtual bool Execute(SyncMessage& request, AsyncMessage& response, CStdString& hostname, int tcpPort, CStdString& serviceName, int timeout = 5) = 0; @@ -34,7 +34,7 @@ protected: }; /** Client that uses a HTTP URL request and receives the response back in the SingleLine format. */ -class DLL_IMPORT_EXPORT OrkHttpSingleLineClient : public OrkHttpClient +class DLL_IMPORT_EXPORT_ORKBASE OrkHttpSingleLineClient : public OrkHttpClient { public: bool Execute(SyncMessage& request, AsyncMessage& response, CStdString& hostname, int tcpPort, CStdString& serviceName, int timeout = 5); diff --git a/orkbasecxx/Utils.h b/orkbasecxx/Utils.h index 93ea989..3b7d5c6 100644 --- a/orkbasecxx/Utils.h +++ b/orkbasecxx/Utils.h @@ -66,9 +66,9 @@ inline double StringToDouble(CStdString& value) //======================================================== // file related stuff -CStdString DLL_IMPORT_EXPORT FileBaseName(CStdString& path); -CStdString DLL_IMPORT_EXPORT FileStripExtension(CStdString& filename); -bool DLL_IMPORT_EXPORT FileCanOpen(CStdString& path); +CStdString DLL_IMPORT_EXPORT_ORKBASE FileBaseName(CStdString& path); +CStdString DLL_IMPORT_EXPORT_ORKBASE FileStripExtension(CStdString& filename); +bool DLL_IMPORT_EXPORT_ORKBASE FileCanOpen(CStdString& path); diff --git a/orkbasecxx/messages/AsyncMessage.h b/orkbasecxx/messages/AsyncMessage.h index bbdb313..8f02dde 100644 --- a/orkbasecxx/messages/AsyncMessage.h +++ b/orkbasecxx/messages/AsyncMessage.h @@ -20,7 +20,7 @@ /** An AsyncMessage is an asynchronous message ("fire and forget"). It can also be the response to a synchronous message. */ -class DLL_IMPORT_EXPORT AsyncMessage : public Message +class DLL_IMPORT_EXPORT_ORKBASE AsyncMessage : public Message { //public: // void send(XmlRpc::XmlRpcClient& c); @@ -29,7 +29,7 @@ class DLL_IMPORT_EXPORT AsyncMessage : public Message /** A SimpleResponseMsg is used as a response when commands can just succeed or fail. Additionally, there is textual comment field e.g. for error messages. */ -class DLL_IMPORT_EXPORT SimpleResponseMsg : public AsyncMessage +class DLL_IMPORT_EXPORT_ORKBASE SimpleResponseMsg : public AsyncMessage { public: SimpleResponseMsg(); diff --git a/orkbasecxx/messages/Message.h b/orkbasecxx/messages/Message.h index c8ad044..1abfcc0 100644 --- a/orkbasecxx/messages/Message.h +++ b/orkbasecxx/messages/Message.h @@ -38,7 +38,7 @@ /** A Message is an Object that is meant to be sent to a remote server. */ -class DLL_IMPORT_EXPORT Message : public Object +class DLL_IMPORT_EXPORT_ORKBASE Message : public Object { public: Message(); diff --git a/orkbasecxx/messages/SyncMessage.h b/orkbasecxx/messages/SyncMessage.h index 598ffe3..0683364 100644 --- a/orkbasecxx/messages/SyncMessage.h +++ b/orkbasecxx/messages/SyncMessage.h @@ -22,7 +22,7 @@ /** A SyncMessage is a synchronous message that needs an immediate answer from the remote server. The response should be an AsyncMessage */ -class DLL_IMPORT_EXPORT SyncMessage : public Message +class DLL_IMPORT_EXPORT_ORKBASE SyncMessage : public Message { public: }; diff --git a/orkbasecxx/serializers/DomSerializer.h b/orkbasecxx/serializers/DomSerializer.h index 4190d59..1e2b264 100644 --- a/orkbasecxx/serializers/DomSerializer.h +++ b/orkbasecxx/serializers/DomSerializer.h @@ -26,7 +26,7 @@ using namespace XERCES_CPP_NAMESPACE; This class allows a nested object to be serialized or deserialized to or from a xerces DOM object. */ -class DLL_IMPORT_EXPORT DomSerializer : public Serializer +class DLL_IMPORT_EXPORT_ORKBASE DomSerializer : public Serializer { public: DomSerializer(Object* object) : Serializer(object){}; @@ -54,7 +54,7 @@ protected: }; /** Container for xerces unicode string initialized with char* string */ -class DLL_IMPORT_EXPORT XStr +class DLL_IMPORT_EXPORT_ORKBASE XStr { public : inline XStr(const char* const toTranscode) diff --git a/orkbasecxx/serializers/Serializer.h b/orkbasecxx/serializers/Serializer.h index c2e827e..e7ea659 100644 --- a/orkbasecxx/serializers/Serializer.h +++ b/orkbasecxx/serializers/Serializer.h @@ -30,7 +30,7 @@ class Object; /** Base class for serializing Objects. */ -class DLL_IMPORT_EXPORT Serializer +class DLL_IMPORT_EXPORT_ORKBASE Serializer { public: Serializer(Object* object); @@ -70,7 +70,7 @@ typedef boost::shared_ptr SerializerRef; /** Base class for all Key-Value pair based serializers. */ -class DLL_IMPORT_EXPORT KeyValueSerializer : public Serializer +class DLL_IMPORT_EXPORT_ORKBASE KeyValueSerializer : public Serializer { public: KeyValueSerializer(Object* object) : Serializer(object), m_numParams(0){}; diff --git a/orkbasecxx/serializers/SingleLineSerializer.h b/orkbasecxx/serializers/SingleLineSerializer.h index 62ada27..8ae6131 100644 --- a/orkbasecxx/serializers/SingleLineSerializer.h +++ b/orkbasecxx/serializers/SingleLineSerializer.h @@ -22,7 +22,7 @@ key and values are separated by equal signs. example: message=doit what=run */ -class DLL_IMPORT_EXPORT SingleLineSerializer : public KeyValueSerializer +class DLL_IMPORT_EXPORT_ORKBASE SingleLineSerializer : public KeyValueSerializer { public: SingleLineSerializer(Object* object) : KeyValueSerializer(object){}; diff --git a/orkbasecxx/serializers/UrlSerializer.h b/orkbasecxx/serializers/UrlSerializer.h index 5c2ce21..037e983 100644 --- a/orkbasecxx/serializers/UrlSerializer.h +++ b/orkbasecxx/serializers/UrlSerializer.h @@ -22,7 +22,7 @@ keys and values are separated by equal signs example: message=doit&what=run */ -class DLL_IMPORT_EXPORT UrlSerializer : public KeyValueSerializer +class DLL_IMPORT_EXPORT_ORKBASE UrlSerializer : public KeyValueSerializer { public: UrlSerializer(Object* object) : KeyValueSerializer(object){}; -- cgit v1.2.3