You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by tr...@apache.org on 2011/05/17 23:02:37 UTC

svn commit: r1104559 [2/2] - in /qpid/trunk/qpid/cpp: include/qmf/ include/qmf/engine/ include/qpid/ include/qpid/agent/ include/qpid/client/ include/qpid/console/ include/qpid/framing/ include/qpid/log/ include/qpid/management/ include/qpid/messaging/...

Modified: qpid/trunk/qpid/cpp/include/qpid/types/Variant.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/types/Variant.h?rev=1104559&r1=1104558&r2=1104559&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qpid/types/Variant.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/types/Variant.h Tue May 17 21:02:34 2011
@@ -36,7 +36,7 @@ namespace types {
 /**
  * Thrown when an illegal conversion of a variant is attempted.
  */
-struct InvalidConversion : public Exception 
+struct QPID_TYPES_CLASS_EXTERN InvalidConversion : public Exception 
 {
     InvalidConversion(const std::string& msg);
 };
@@ -67,7 +67,7 @@ class VariantImpl;
 /**
  * Represents a value of variable type.
  */
-class Variant
+class QPID_TYPES_CLASS_EXTERN Variant
 {
   public:
     typedef std::map<std::string, Variant> Map;

Modified: qpid/trunk/qpid/cpp/rubygen/0-10/specification.rb
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/rubygen/0-10/specification.rb?rev=1104559&r1=1104558&r2=1104559&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/rubygen/0-10/specification.rb (original)
+++ qpid/trunk/qpid/cpp/rubygen/0-10/specification.rb Tue May 17 21:02:34 2011
@@ -252,7 +252,7 @@ class Specification < CppGen
       include "#{@dir}/specification"
       namespace(@ns) { 
         genl "template <class F, class R=typename F::result_type>"
-        cpp_class("ProxyTemplate") {
+        cpp_extern_class("QPID_COMMON_CLASS_EXTERN", "ProxyTemplate") {
           public
           genl "ProxyTemplate(F f=F()) : functor(f) {}"
           @amqp.classes.each { |c|

Modified: qpid/trunk/qpid/cpp/rubygen/MethodBodyDefaultVisitor.rb
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/rubygen/MethodBodyDefaultVisitor.rb?rev=1104559&r1=1104558&r2=1104559&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/rubygen/MethodBodyDefaultVisitor.rb (original)
+++ qpid/trunk/qpid/cpp/rubygen/MethodBodyDefaultVisitor.rb Tue May 17 21:02:34 2011
@@ -33,7 +33,7 @@ class MethodBodyDefaultVisitorGen < CppG
       include "qpid/framing/MethodBodyConstVisitor"
       namespace(@namespace) { 
         genl
-        cpp_class(@classname, "public MethodBodyConstVisitor") {
+        cpp_extern_class("QPID_COMMON_CLASS_EXTERN", @classname, "public MethodBodyConstVisitor") {
           genl "public:"
           genl "virtual void defaultVisit() = 0;"
           @amqp.methods_.each { |m|

Modified: qpid/trunk/qpid/cpp/rubygen/cppgen.rb
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/rubygen/cppgen.rb?rev=1104559&r1=1104558&r2=1104559&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/rubygen/cppgen.rb (original)
+++ qpid/trunk/qpid/cpp/rubygen/cppgen.rb Tue May 17 21:02:34 2011
@@ -377,6 +377,9 @@ class CppGen < Generator
   def cpp_class(name, *bases, &block)
     struct_class("class", name, bases, &block);
   end
+  def cpp_extern_class(scope, name, *bases, &block)
+    struct_class("class "+scope, name, bases, &block);
+  end
 
   def typedef(type, name) genl "typedef #{type} #{name};\n"; end
 

Modified: qpid/trunk/qpid/cpp/rubygen/framing.0-10/MethodBodyDefaultVisitor.rb
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/rubygen/framing.0-10/MethodBodyDefaultVisitor.rb?rev=1104559&r1=1104558&r2=1104559&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/rubygen/framing.0-10/MethodBodyDefaultVisitor.rb (original)
+++ qpid/trunk/qpid/cpp/rubygen/framing.0-10/MethodBodyDefaultVisitor.rb Tue May 17 21:02:34 2011
@@ -33,7 +33,7 @@ class MethodBodyDefaultVisitorGen < CppG
       include "qpid/CommonImportExport.h"
       namespace(@namespace) { 
         genl "class AMQMethodBody;"
-        cpp_class(@classname, "public MethodBodyConstVisitor") {
+        cpp_extern_class("QPID_COMMON_CLASS_EXTERN", @classname, "public MethodBodyConstVisitor") {
           genl "public:"
           genl "virtual void defaultVisit(const AMQMethodBody&) = 0;"
           @amqp.methods_.each { |m|

Modified: qpid/trunk/qpid/cpp/rubygen/framing.0-10/OperationsInvoker.rb
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/rubygen/framing.0-10/OperationsInvoker.rb?rev=1104559&r1=1104558&r2=1104559&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/rubygen/framing.0-10/OperationsInvoker.rb (original)
+++ qpid/trunk/qpid/cpp/rubygen/framing.0-10/OperationsInvoker.rb Tue May 17 21:02:34 2011
@@ -69,7 +69,7 @@ class OperationsInvokerGen < CppGen
   def invoker_h(invoker, target, methods)
     return if methods.empty?
     genl
-    cpp_class(invoker, "public qpid::framing::Invoker") {
+    cpp_extern_class("QPID_COMMON_CLASS_EXTERN", invoker, "public qpid::framing::Invoker") {
       genl "#{target}& target;"
       public
       genl("Invoker(#{target}& target_) : target(target_) {}")

Modified: qpid/trunk/qpid/cpp/rubygen/framing.0-10/Proxy.rb
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/rubygen/framing.0-10/Proxy.rb?rev=1104559&r1=1104558&r2=1104559&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/rubygen/framing.0-10/Proxy.rb (original)
+++ qpid/trunk/qpid/cpp/rubygen/framing.0-10/Proxy.rb Tue May 17 21:02:34 2011
@@ -37,7 +37,7 @@ class ProxyGen < CppGen
   
   def inner_class_decl(c)
     cname=c.name.caps
-    cpp_class(cname, "public Proxy") {
+    cpp_extern_class("QPID_COMMON_CLASS_EXTERN", cname, "public Proxy") {
           gen <<EOS
 public:
 #{cname}(FrameHandler& f) : Proxy(f) {}
@@ -69,7 +69,7 @@ EOS
       include "qpid/CommonImportExport.h"
 
       namespace("qpid::framing") { 
-        cpp_class(@classname, "public Proxy") {
+        cpp_extern_class("QPID_COMMON_CLASS_EXTERN", @classname, "public Proxy") {
           public
           genl "QPID_COMMON_EXTERN #{@classname}(FrameHandler& out);"
           genl

Modified: qpid/trunk/qpid/cpp/rubygen/framing.0-10/Session.rb
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/rubygen/framing.0-10/Session.rb?rev=1104559&r1=1104558&r2=1104559&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/rubygen/framing.0-10/Session.rb (original)
+++ qpid/trunk/qpid/cpp/rubygen/framing.0-10/Session.rb Tue May 17 21:02:34 2011
@@ -56,8 +56,8 @@ module SyncAsync
   def decl_ctor_opeq()
     genl
     genl "QPID_CLIENT_EXTERN #{@classname}();"
-    genl "QPID_CLIENT_EXTERN #{@classname}(const #{@version_base}& other);"
-    genl "QPID_CLIENT_EXTERN #{@classname}& operator=(const #{@version_base}& other);"
+    genl "QPID_CLIENT_INLINE_EXTERN #{@classname}(const #{@version_base}& other);"
+    genl "QPID_CLIENT_INLINE_EXTERN #{@classname}& operator=(const #{@version_base}& other);"
   end
 
   def defn_ctor_opeq(inline="")

Modified: qpid/trunk/qpid/cpp/rubygen/framing.0-10/structs.rb
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/rubygen/framing.0-10/structs.rb?rev=1104559&r1=1104558&r2=1104559&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/rubygen/framing.0-10/structs.rb (original)
+++ qpid/trunk/qpid/cpp/rubygen/framing.0-10/structs.rb Tue May 17 21:02:34 2011
@@ -406,7 +406,7 @@ EOS
 namespace qpid {
 namespace framing {
 
-class #{classname} #{inheritance} {
+class QPID_COMMON_CLASS_EXTERN #{classname} #{inheritance} {
 EOS
   if (is_packed(s))
     indent { s.fields.each { |f| genl "#{f.cpptype.name} #{f.cppname};" unless f.type_ == "bit"} }

Modified: qpid/trunk/qpid/cpp/src/Makefile.am
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/Makefile.am?rev=1104559&r1=1104558&r2=1104559&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ qpid/trunk/qpid/cpp/src/Makefile.am Tue May 17 21:02:34 2011
@@ -804,6 +804,7 @@ nobase_include_HEADERS +=			\
   ../include/qpid/Address.h			\
   ../include/qpid/CommonImportExport.h		\
   ../include/qpid/Exception.h			\
+  ../include/qpid/ImportExport.h		\
   ../include/qpid/InlineAllocator.h		\
   ../include/qpid/InlineVector.h		\
   ../include/qpid/Msg.h				\

Modified: qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/SessionHandler.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/SessionHandler.h?rev=1104559&r1=1104558&r2=1104559&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/SessionHandler.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/amqp_0_10/SessionHandler.h Tue May 17 21:02:34 2011
@@ -41,8 +41,8 @@ namespace amqp_0_10 {
  * to a session state.
  */
 
-class SessionHandler : public framing::AMQP_AllOperations::SessionHandler,
-                       public framing::FrameHandler::InOutHandler
+class QPID_COMMON_CLASS_EXTERN SessionHandler : public framing::AMQP_AllOperations::SessionHandler,
+        public framing::FrameHandler::InOutHandler
 {
   public:
     QPID_COMMON_EXTERN SessionHandler(framing::FrameHandler* out=0, uint16_t channel=0);

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/BrokerImportExport.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/BrokerImportExport.h?rev=1104559&r1=1104558&r2=1104559&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/BrokerImportExport.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/BrokerImportExport.h Tue May 17 21:02:34 2011
@@ -20,14 +20,23 @@
  * under the License.
  */
 
-#if defined(WIN32) && !defined(QPID_BROKER_STATIC)
-#if defined(BROKER_EXPORT) || defined (qpidbroker_EXPORTS)
-#define QPID_BROKER_EXTERN __declspec(dllexport)
+#if defined(WIN32) && !defined(QPID_DECLARE_STATIC)
+#  if defined(BROKER_EXPORT) || defined (qpidbroker_EXPORTS)
+#    define QPID_BROKER_EXTERN __declspec(dllexport)
+#  else
+#    define QPID_BROKER_EXTERN __declspec(dllimport)
+#  endif
+#  ifdef _MSC_VER
+#    define QPID_BROKER_CLASS_EXTERN
+#    define QPID_BROKER_INLINE_EXTERN QPID_BROKER_EXTERN
+#  else
+#    define QPID_BROKER_CLASS_EXTERN QPID_BROKER_EXTERN
+#    define QPID_BROKER_INLINE_EXTERN
+#  endif
 #else
-#define QPID_BROKER_EXTERN __declspec(dllimport)
-#endif
-#else
-#define QPID_BROKER_EXTERN 
+#  define QPID_BROKER_EXTERN
+#  define QPID_BROKER_CLASS_EXTERN
+#  define QPID_BROKER_INLINE_EXTERN
 #endif
 
 #endif

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/DeliverableMessage.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/DeliverableMessage.h?rev=1104559&r1=1104558&r2=1104559&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/DeliverableMessage.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/DeliverableMessage.h Tue May 17 21:02:34 2011
@@ -29,7 +29,7 @@
 
 namespace qpid {
     namespace broker {
-        class DeliverableMessage : public Deliverable{
+        class QPID_BROKER_CLASS_EXTERN DeliverableMessage : public Deliverable{
             boost::intrusive_ptr<Message> msg;
         public:
             QPID_BROKER_EXTERN DeliverableMessage(const boost::intrusive_ptr<Message>& msg);

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Exchange.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Exchange.h?rev=1104559&r1=1104558&r2=1104559&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Exchange.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Exchange.h Tue May 17 21:02:34 2011
@@ -39,7 +39,7 @@ namespace broker {
 class Broker;
 class ExchangeRegistry;
 
-class Exchange : public PersistableExchange, public management::Manageable {
+class QPID_BROKER_CLASS_EXTERN Exchange : public PersistableExchange, public management::Manageable {
 public:
     struct Binding : public management::Manageable {
         typedef boost::shared_ptr<Binding>       shared_ptr;
@@ -166,7 +166,7 @@ public:
                                          Broker* broker = 0);
     QPID_BROKER_EXTERN Exchange(const std::string& _name, bool _durable, const qpid::framing::FieldTable& _args,
                                 management::Manageable* parent = 0, Broker* broker = 0);
-    QPID_BROKER_EXTERN virtual ~Exchange();
+    QPID_BROKER_INLINE_EXTERN virtual ~Exchange();
 
     const std::string& getName() const { return name; }
     bool isDurable() { return durable; }

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/ExpiryPolicy.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/ExpiryPolicy.h?rev=1104559&r1=1104558&r2=1104559&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/ExpiryPolicy.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/ExpiryPolicy.h Tue May 17 21:02:34 2011
@@ -33,7 +33,7 @@ class Message;
 /**
  * Default expiry policy.
  */
-class ExpiryPolicy : public RefCounted
+class QPID_BROKER_CLASS_EXTERN ExpiryPolicy : public RefCounted
 {
   public:
     QPID_BROKER_EXTERN virtual ~ExpiryPolicy();

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/MessageBuilder.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/MessageBuilder.h?rev=1104559&r1=1104558&r2=1104559&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/MessageBuilder.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/MessageBuilder.h Tue May 17 21:02:34 2011
@@ -33,7 +33,7 @@ namespace qpid {
         class Message;
         class MessageStore;
 
-        class MessageBuilder : public framing::FrameHandler{
+        class QPID_BROKER_CLASS_EXTERN MessageBuilder : public framing::FrameHandler{
         public:
             QPID_BROKER_EXTERN MessageBuilder(MessageStore* const store);
             QPID_BROKER_EXTERN void handle(framing::AMQFrame& frame);

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.h?rev=1104559&r1=1104558&r2=1104559&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/NullMessageStore.h Tue May 17 21:02:34 2011
@@ -35,7 +35,7 @@ namespace broker {
 /**
  * A null implementation of the MessageStore interface
  */
-class NullMessageStore : public MessageStore
+class QPID_BROKER_CLASS_EXTERN NullMessageStore : public MessageStore
 {
     std::set<std::string> prepared;
     uint64_t nextPersistenceId;

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/PersistableMessage.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/PersistableMessage.h?rev=1104559&r1=1104558&r2=1104559&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/PersistableMessage.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/PersistableMessage.h Tue May 17 21:02:34 2011
@@ -115,11 +115,11 @@ class PersistableMessage : public Persis
     virtual QPID_BROKER_EXTERN bool isPersistent() const = 0;
 
     /** track the progress of a message received by the broker - see ingressCompletion above */
-    QPID_BROKER_EXTERN bool isIngressComplete() { return ingressCompletion.isDone(); }
-    QPID_BROKER_EXTERN AsyncCompletion& getIngressCompletion() { return ingressCompletion; }
+    QPID_BROKER_INLINE_EXTERN bool isIngressComplete() { return ingressCompletion.isDone(); }
+    QPID_BROKER_INLINE_EXTERN AsyncCompletion& getIngressCompletion() { return ingressCompletion; }
 
-    QPID_BROKER_EXTERN void enqueueStart() { ingressCompletion.startCompleter(); }
-    QPID_BROKER_EXTERN void enqueueComplete() { ingressCompletion.finishCompleter(); }
+    QPID_BROKER_INLINE_EXTERN void enqueueStart() { ingressCompletion.startCompleter(); }
+    QPID_BROKER_INLINE_EXTERN void enqueueComplete() { ingressCompletion.finishCompleter(); }
 
     QPID_BROKER_EXTERN void enqueueAsync(PersistableQueue::shared_ptr queue,
                                          MessageStore* _store);

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/TopicExchange.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/TopicExchange.h?rev=1104559&r1=1104558&r2=1104559&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/TopicExchange.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/TopicExchange.h Tue May 17 21:02:34 2011
@@ -56,7 +56,7 @@ class TopicExchange : public virtual Exc
     //    |   +-->d-->...
     //    +-->x-->y-->...
     //
-    class BindingNode {
+    class QPID_BROKER_CLASS_EXTERN BindingNode {
     public:
 
         typedef boost::shared_ptr<BindingNode> shared_ptr;

Modified: qpid/trunk/qpid/cpp/src/qpid/broker/TxPublish.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/TxPublish.h?rev=1104559&r1=1104558&r2=1104559&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/TxPublish.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/TxPublish.h Tue May 17 21:02:34 2011
@@ -45,7 +45,7 @@ namespace qpid {
          * commit() the messages will be passed to the queue for
          * dispatch or to be added to the in-memory queue.
          */
-        class TxPublish : public TxOp, public Deliverable{
+        class QPID_BROKER_CLASS_EXTERN TxPublish : public TxOp, public Deliverable{
 
             class Commit{
                 boost::intrusive_ptr<Message>& msg;

Modified: qpid/trunk/qpid/cpp/src/qpid/framing/AMQBody.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/framing/AMQBody.h?rev=1104559&r1=1104558&r2=1104559&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/framing/AMQBody.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/framing/AMQBody.h Tue May 17 21:02:34 2011
@@ -46,7 +46,7 @@ struct AMQBodyConstVisitor {
     virtual void visit(const AMQMethodBody&) = 0;
 };
 
-class AMQBody : public RefCounted {
+class QPID_COMMON_CLASS_EXTERN AMQBody : public RefCounted {
   public:
     AMQBody() {}
     QPID_COMMON_EXTERN virtual ~AMQBody();

Modified: qpid/trunk/qpid/cpp/src/qpid/framing/AMQContentBody.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/framing/AMQContentBody.h?rev=1104559&r1=1104558&r2=1104559&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/framing/AMQContentBody.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/framing/AMQContentBody.h Tue May 17 21:02:34 2011
@@ -29,7 +29,7 @@
 namespace qpid {
 namespace framing {
 
-class AMQContentBody :  public AMQBody
+class QPID_COMMON_CLASS_EXTERN AMQContentBody :  public AMQBody
 {
     string data;
 
@@ -37,15 +37,15 @@ public:
     QPID_COMMON_EXTERN AMQContentBody();
     QPID_COMMON_EXTERN AMQContentBody(const string& data);
     inline virtual ~AMQContentBody(){}
-    QPID_COMMON_EXTERN inline uint8_t type() const { return CONTENT_BODY; };
-    QPID_COMMON_EXTERN inline const string& getData() const { return data; }
-    QPID_COMMON_EXTERN inline string& getData() { return data; }
+    inline uint8_t type() const { return CONTENT_BODY; };
+    inline const string& getData() const { return data; }
+    inline string& getData() { return data; }
     QPID_COMMON_EXTERN uint32_t encodedSize() const;
     QPID_COMMON_EXTERN void encode(Buffer& buffer) const;
     QPID_COMMON_EXTERN void decode(Buffer& buffer, uint32_t size);
     QPID_COMMON_EXTERN void print(std::ostream& out) const;
-    QPID_COMMON_EXTERN void accept(AMQBodyConstVisitor& v) const { v.visit(*this); }
-    QPID_COMMON_EXTERN boost::intrusive_ptr<AMQBody> clone() const { return BodyFactory::copy(*this); }
+    void accept(AMQBodyConstVisitor& v) const { v.visit(*this); }
+    boost::intrusive_ptr<AMQBody> clone() const { return BodyFactory::copy(*this); }
 };
 
 }

Modified: qpid/trunk/qpid/cpp/src/qpid/framing/AMQFrame.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/framing/AMQFrame.h?rev=1104559&r1=1104558&r2=1104559&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/framing/AMQFrame.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/framing/AMQFrame.h Tue May 17 21:02:34 2011
@@ -33,7 +33,7 @@
 namespace qpid {
 namespace framing {
 
-class AMQFrame : public AMQDataBlock
+class QPID_COMMON_CLASS_EXTERN AMQFrame : public AMQDataBlock
 {
   public:
     QPID_COMMON_EXTERN AMQFrame(const boost::intrusive_ptr<AMQBody>& b=0);

Modified: qpid/trunk/qpid/cpp/src/qpid/framing/AMQHeaderBody.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/framing/AMQHeaderBody.h?rev=1104559&r1=1104558&r2=1104559&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/framing/AMQHeaderBody.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/framing/AMQHeaderBody.h Tue May 17 21:02:34 2011
@@ -35,7 +35,7 @@
 namespace qpid {
 namespace framing {
 
-class AMQHeaderBody :  public AMQBody
+class QPID_COMMON_CLASS_EXTERN AMQHeaderBody :  public AMQBody
 {
     template <class T> struct OptProps { boost::optional<T> props; };
     template <class Base, class T>

Modified: qpid/trunk/qpid/cpp/src/qpid/framing/AMQHeartbeatBody.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/framing/AMQHeartbeatBody.h?rev=1104559&r1=1104558&r2=1104559&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/framing/AMQHeartbeatBody.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/framing/AMQHeartbeatBody.h Tue May 17 21:02:34 2011
@@ -29,7 +29,7 @@
 namespace qpid {
 namespace framing {
 
-class AMQHeartbeatBody :  public AMQBody
+class QPID_COMMON_CLASS_EXTERN AMQHeartbeatBody :  public AMQBody
 {
 public:
     QPID_COMMON_EXTERN virtual ~AMQHeartbeatBody();

Modified: qpid/trunk/qpid/cpp/src/qpid/framing/TransferContent.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/framing/TransferContent.h?rev=1104559&r1=1104558&r2=1104559&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/framing/TransferContent.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/framing/TransferContent.h Tue May 17 21:02:34 2011
@@ -32,7 +32,7 @@ namespace qpid {
 namespace framing {
 
 /** Message content */
-class TransferContent : public MethodContent
+class QPID_COMMON_CLASS_EXTERN TransferContent : public MethodContent
 {
     AMQHeaderBody header;
     std::string data;

Modified: qpid/trunk/qpid/cpp/src/qpid/log/windows/SinkOptions.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/log/windows/SinkOptions.h?rev=1104559&r1=1104558&r2=1104559&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/log/windows/SinkOptions.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/log/windows/SinkOptions.h Tue May 17 21:02:34 2011
@@ -26,7 +26,7 @@ namespace qpid {
 namespace log {
 namespace windows {
 
-struct SinkOptions : public qpid::log::SinkOptions {
+struct QPID_COMMON_CLASS_EXTERN SinkOptions : public qpid::log::SinkOptions {
     QPID_COMMON_EXTERN SinkOptions(const std::string& argv0);
     virtual ~SinkOptions() {}
 

Modified: qpid/trunk/qpid/cpp/src/qpid/sys/AggregateOutput.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/AggregateOutput.h?rev=1104559&r1=1104558&r2=1104559&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/AggregateOutput.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/AggregateOutput.h Tue May 17 21:02:34 2011
@@ -41,7 +41,7 @@ namespace sys {
  * doOutput is called in another.
  */
 
-class AggregateOutput : public OutputTask, public OutputControl
+class QPID_COMMON_CLASS_EXTERN AggregateOutput : public OutputTask, public OutputControl
 {
     typedef std::deque<OutputTask*> TaskList;
 

Modified: qpid/trunk/qpid/cpp/src/qpid/sys/AsynchIOHandler.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/AsynchIOHandler.h?rev=1104559&r1=1104558&r2=1104559&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/AsynchIOHandler.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/AsynchIOHandler.h Tue May 17 21:02:34 2011
@@ -57,7 +57,7 @@ class AsynchIOHandler : public OutputCon
     QPID_COMMON_EXTERN ~AsynchIOHandler();
     QPID_COMMON_EXTERN void init(AsynchIO* a, int numBuffs);
 
-    QPID_COMMON_EXTERN void setClient() { isClient = true; }
+    QPID_COMMON_INLINE_EXTERN void setClient() { isClient = true; }
 
     // Output side
     QPID_COMMON_EXTERN void abort();

Modified: qpid/trunk/qpid/cpp/src/qpid/sys/Poller.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/Poller.h?rev=1104559&r1=1104558&r2=1104559&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/Poller.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/Poller.h Tue May 17 21:02:34 2011
@@ -120,7 +120,7 @@ class PollerHandle {
     friend struct Poller::Event;
 
     PollerHandlePrivate* const impl;
-    QPID_COMMON_EXTERN virtual void processEvent(Poller::EventType) {};
+    QPID_COMMON_INLINE_EXTERN virtual void processEvent(Poller::EventType) {};
 
 public:
     QPID_COMMON_EXTERN PollerHandle(const IOHandle& h);

Modified: qpid/trunk/qpid/cpp/src/qpid/sys/Socket.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/Socket.h?rev=1104559&r1=1104558&r2=1104559&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/Socket.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/Socket.h Tue May 17 21:02:34 2011
@@ -33,7 +33,7 @@ namespace sys {
 class Duration;
 class SocketAddress;
 
-class Socket : public IOHandle
+class QPID_COMMON_CLASS_EXTERN Socket : public IOHandle
 {
 public:
     /** Create a socket wrapper for descriptor. */
@@ -84,7 +84,7 @@ public:
     /**
      * Returns the full address of the connection: local and remote host and port.
      */
-    QPID_COMMON_EXTERN std::string getFullAddress() const { return getLocalAddress()+"-"+getPeerAddress(); }
+    QPID_COMMON_INLINE_EXTERN std::string getFullAddress() const { return getLocalAddress()+"-"+getPeerAddress(); }
 
     QPID_COMMON_EXTERN uint16_t getLocalPort() const;
     uint16_t getRemotePort() const;



---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project:      http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org