diff options
| author | Stephen D. Huston <shuston@apache.org> | 2009-08-20 22:43:06 +0000 |
|---|---|---|
| committer | Stephen D. Huston <shuston@apache.org> | 2009-08-20 22:43:06 +0000 |
| commit | f91c7269e0a4c60f2db1fd093d51fb7e2b90fced (patch) | |
| tree | 9dd6fc5d4ee9ca8db6ee2a32943a0fc018b20784 /cpp/src | |
| parent | a043417121ebe286333b4aad1b7b057a9293279d (diff) | |
| download | qpid-python-f91c7269e0a4c60f2db1fd093d51fb7e2b90fced.tar.gz | |
Add needed extern decorators for Windows; applies patch QPID-2061-1.patch in QPID-2061
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@806384 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/qpid/client/Demux.h | 21 | ||||
| -rw-r--r-- | cpp/src/qpid/client/SessionImpl.h | 3 |
2 files changed, 13 insertions, 11 deletions
diff --git a/cpp/src/qpid/client/Demux.h b/cpp/src/qpid/client/Demux.h index 7304e799bb..31dc3f9c06 100644 --- a/cpp/src/qpid/client/Demux.h +++ b/cpp/src/qpid/client/Demux.h @@ -25,6 +25,7 @@ #include "qpid/framing/FrameSet.h" #include "qpid/sys/Mutex.h" #include "qpid/sys/BlockingQueue.h" +#include "qpid/client/ClientImportExport.h" #ifndef _Demux_ #define _Demux_ @@ -49,17 +50,17 @@ public: typedef sys::BlockingQueue<framing::FrameSet::shared_ptr> Queue; typedef boost::shared_ptr<Queue> QueuePtr; - Demux(); - ~Demux(); + QPID_CLIENT_EXTERN Demux(); + QPID_CLIENT_EXTERN ~Demux(); - void handle(framing::FrameSet::shared_ptr); - void close(const sys::ExceptionHolder& ex); - void open(); - - QueuePtr add(const std::string& name, Condition); - void remove(const std::string& name); - QueuePtr get(const std::string& name); - QueuePtr getDefault(); + QPID_CLIENT_EXTERN void handle(framing::FrameSet::shared_ptr); + QPID_CLIENT_EXTERN void close(const sys::ExceptionHolder& ex); + QPID_CLIENT_EXTERN void open(); + + QPID_CLIENT_EXTERN QueuePtr add(const std::string& name, Condition); + QPID_CLIENT_EXTERN void remove(const std::string& name); + QPID_CLIENT_EXTERN QueuePtr get(const std::string& name); + QPID_CLIENT_EXTERN QueuePtr getDefault(); private: struct Record diff --git a/cpp/src/qpid/client/SessionImpl.h b/cpp/src/qpid/client/SessionImpl.h index b5bb18cfe6..3659450236 100644 --- a/cpp/src/qpid/client/SessionImpl.h +++ b/cpp/src/qpid/client/SessionImpl.h @@ -25,6 +25,7 @@ #include "qpid/client/Demux.h" #include "qpid/client/Execution.h" #include "qpid/client/Results.h" +#include "qpid/client/ClientImportExport.h" #include "qpid/SessionId.h" #include "qpid/SessionState.h" @@ -94,7 +95,7 @@ public: * the header and content from the frameset will be copied and * reframed correctly for the connection. */ - Future send(const framing::AMQBody& command, const framing::FrameSet& content, bool reframe=false); + QPID_CLIENT_EXTERN Future send(const framing::AMQBody& command, const framing::FrameSet& content, bool reframe=false); void sendRawFrame(framing::AMQFrame& frame); Demux& getDemux(); |