Author: shuston Date: Thu Aug 20 22:43:06 2009 New Revision: 806384 URL: http://svn.apache.org/viewvc?rev=806384&view=rev Log: Add needed extern decorators for Windows; applies patch QPID-2061-1.patch in QPID-2061
Modified: qpid/trunk/qpid/cpp/include/qpid/framing/FieldValue.h qpid/trunk/qpid/cpp/src/qpid/client/Demux.h qpid/trunk/qpid/cpp/src/qpid/client/SessionImpl.h Modified: qpid/trunk/qpid/cpp/include/qpid/framing/FieldValue.h URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/framing/FieldValue.h?rev=806384&r1=806383&r2=806384&view=diff ============================================================================== --- qpid/trunk/qpid/cpp/include/qpid/framing/FieldValue.h (original) +++ qpid/trunk/qpid/cpp/include/qpid/framing/FieldValue.h Thu Aug 20 22:43:06 2009 @@ -83,7 +83,7 @@ FieldValue(): data(0) {}; // Default assignment operator is fine void setType(uint8_t type); - uint8_t getType(); + QPID_COMMON_EXTERN uint8_t getType(); Data& getData() { return *data; } uint32_t encodedSize() const { return 1 + data->encodedSize(); }; bool empty() const { return data.get() == 0; } Modified: qpid/trunk/qpid/cpp/src/qpid/client/Demux.h URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/Demux.h?rev=806384&r1=806383&r2=806384&view=diff ============================================================================== --- qpid/trunk/qpid/cpp/src/qpid/client/Demux.h (original) +++ qpid/trunk/qpid/cpp/src/qpid/client/Demux.h Thu Aug 20 22:43:06 2009 @@ -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 @@ 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 Modified: qpid/trunk/qpid/cpp/src/qpid/client/SessionImpl.h URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/SessionImpl.h?rev=806384&r1=806383&r2=806384&view=diff ============================================================================== --- qpid/trunk/qpid/cpp/src/qpid/client/SessionImpl.h (original) +++ qpid/trunk/qpid/cpp/src/qpid/client/SessionImpl.h Thu Aug 20 22:43:06 2009 @@ -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 @@ * 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(); --------------------------------------------------------------------- Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscr...@qpid.apache.org