Added remaining needed exports

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/qpid-1673@750236 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 57 insertions, 45 deletions

diff --git a/qpid/cpp/src/qpid/console/Broker.h b/qpid/cpp/src/qpid/console/Broker.h
index 71c7c745a1..ddbd973dfe 100644
--- a/qpid/cpp/src/qpid/console/Broker.h
+++ b/qpid/cpp/src/qpid/console/Broker.h
@@ -51,8 +51,9 @@ namespace console {
      */
     class Broker : public client::MessageListener {
     public:
-        Broker(SessionManager& sm, client::ConnectionSettings& settings);
-        ~Broker();
+        QPID_CONSOLE_EXTERN Broker(SessionManager& sm,
+                                   client::ConnectionSettings& settings);
+        QPID_CONSOLE_EXTERN ~Broker();
         
         bool isConnected() const { return connected; }
         const std::string& getError() const { return error; }
diff --git a/qpid/cpp/src/qpid/console/Event.h b/qpid/cpp/src/qpid/console/Event.h
index 5d41af6864..4d51708965 100644
--- a/qpid/cpp/src/qpid/console/Event.h
+++ b/qpid/cpp/src/qpid/console/Event.h
@@ -47,26 +47,28 @@ namespace console {
         SEV_WARNING = 4, SEV_NOTICE = 5, SEV_INFO = 6, SEV_DEBUG = 7
         } Severity;
 
-        Event(Broker* broker, SchemaClass* schemaClass, framing::Buffer& buffer);
+        QPID_CONSOLE_EXTERN Event(Broker* broker,
+                                  SchemaClass* schemaClass,
+                                  framing::Buffer& buffer);
         Broker* getBroker() const { return broker; }
-        const ClassKey& getClassKey() const;
+        QPID_CONSOLE_EXTERN const ClassKey& getClassKey() const;
         SchemaClass* getSchema() const { return schema; }
         const Object::AttributeMap& getAttributes() const { return attributes; }
         uint64_t getTimestamp() const { return timestamp; }
         uint8_t getSeverity() const { return severity; }
-        std::string getSeverityString() const;
+        QPID_CONSOLE_EXTERN std::string getSeverityString() const;
 
-        ObjectId attrRef(const std::string& key) const;
-        uint32_t attrUint(const std::string& key) const;
-        int32_t attrInt(const std::string& key) const;
-        uint64_t attrUint64(const std::string& key) const;
-        int64_t attrInt64(const std::string& key) const;
-        std::string attrString(const std::string& key) const;
-        bool attrBool(const std::string& key) const;
-        float attrFloat(const std::string& key) const;
-        double attrDouble(const std::string& key) const;
-        framing::Uuid attrUuid(const std::string& key) const;
-        framing::FieldTable attrMap(const std::string& key) const;
+        QPID_CONSOLE_EXTERN ObjectId attrRef(const std::string& key) const;
+        QPID_CONSOLE_EXTERN uint32_t attrUint(const std::string& key) const;
+        QPID_CONSOLE_EXTERN int32_t attrInt(const std::string& key) const;
+        QPID_CONSOLE_EXTERN uint64_t attrUint64(const std::string& key) const;
+        QPID_CONSOLE_EXTERN int64_t attrInt64(const std::string& key) const;
+        QPID_CONSOLE_EXTERN std::string attrString(const std::string& key) const;
+        QPID_CONSOLE_EXTERN bool attrBool(const std::string& key) const;
+        QPID_CONSOLE_EXTERN float attrFloat(const std::string& key) const;
+        QPID_CONSOLE_EXTERN double attrDouble(const std::string& key) const;
+        QPID_CONSOLE_EXTERN framing::Uuid attrUuid(const std::string& key) const;
+        QPID_CONSOLE_EXTERN framing::FieldTable attrMap(const std::string& key) const;
 
     private:
         Broker* broker;
diff --git a/qpid/cpp/src/qpid/console/Object.h b/qpid/cpp/src/qpid/console/Object.h
index 1f1e02463d..d2fb09ecca 100644
--- a/qpid/cpp/src/qpid/console/Object.h
+++ b/qpid/cpp/src/qpid/console/Object.h
@@ -74,29 +74,32 @@ namespace console {
 
         Broker* getBroker() const { return broker; }
         const ObjectId& getObjectId() const { return objectId; }
-        const ClassKey& getClassKey() const;
+        QPID_CONSOLE_EXTERN const ClassKey& getClassKey() const;
         SchemaClass* getSchema() const { return schema; }
         uint64_t getCurrentTime() const { return currentTime; }
         uint64_t getCreateTime() const { return createTime; }
         uint64_t getDeleteTime() const { return deleteTime; }
         bool isDeleted() const { return deleteTime != 0; }
-        std::string getIndex() const;
-        void mergeUpdate(const Object& updated);
+        QPID_CONSOLE_EXTERN std::string getIndex() const;
+        QPID_CONSOLE_EXTERN void mergeUpdate(const Object& updated);
         const AttributeMap& getAttributes() const { return attributes; }
-        void invokeMethod(const std::string name, const AttributeMap& args, MethodResponse& result);
-        void handleMethodResp(framing::Buffer& buffer, uint32_t sequence);
+        QPID_CONSOLE_EXTERN void invokeMethod(const std::string name,
+                                              const AttributeMap& args,
+                                              MethodResponse& result);
+        QPID_CONSOLE_EXTERN void handleMethodResp(framing::Buffer& buffer,
+                                                  uint32_t sequence);
 
-        ObjectId attrRef(const std::string& key) const;
-        uint32_t attrUint(const std::string& key) const;
-        int32_t attrInt(const std::string& key) const;
-        uint64_t attrUint64(const std::string& key) const;
-        int64_t attrInt64(const std::string& key) const;
-        std::string attrString(const std::string& key) const;
-        bool attrBool(const std::string& key) const;
-        float attrFloat(const std::string& key) const;
-        double attrDouble(const std::string& key) const;
-        framing::Uuid attrUuid(const std::string& key) const;
-        framing::FieldTable attrMap(const std::string& key) const;
+        QPID_CONSOLE_EXTERN ObjectId attrRef(const std::string& key) const;
+        QPID_CONSOLE_EXTERN uint32_t attrUint(const std::string& key) const;
+        QPID_CONSOLE_EXTERN int32_t attrInt(const std::string& key) const;
+        QPID_CONSOLE_EXTERN uint64_t attrUint64(const std::string& key) const;
+        QPID_CONSOLE_EXTERN int64_t attrInt64(const std::string& key) const;
+        QPID_CONSOLE_EXTERN std::string attrString(const std::string& key) const;
+        QPID_CONSOLE_EXTERN bool attrBool(const std::string& key) const;
+        QPID_CONSOLE_EXTERN float attrFloat(const std::string& key) const;
+        QPID_CONSOLE_EXTERN double attrDouble(const std::string& key) const;
+        QPID_CONSOLE_EXTERN framing::Uuid attrUuid(const std::string& key) const;
+        QPID_CONSOLE_EXTERN framing::FieldTable attrMap(const std::string& key) const;
 
     private:
         Broker* broker;
diff --git a/qpid/cpp/src/qpid/console/SessionManager.h b/qpid/cpp/src/qpid/console/SessionManager.h
index ab6e111caa..4341fe317c 100644
--- a/qpid/cpp/src/qpid/console/SessionManager.h
+++ b/qpid/cpp/src/qpid/console/SessionManager.h
@@ -22,6 +22,7 @@
  *
  */
 
+#include "ConsoleImportExport.h"
 #include "Broker.h"
 #include "Package.h"
 #include "SequenceManager.h"
@@ -80,8 +81,8 @@ class SessionManager
      * and bindClass methods.  If userBindings is false, the listener will receive
      * updates for all object classes.
      */
-    SessionManager(ConsoleListener* listener = 0,
-                   Settings settings = Settings());
+    QPID_CONSOLE_EXTERN SessionManager(ConsoleListener* listener = 0,
+                                       Settings settings = Settings());
 
     /** Connect a broker to the console session
      *
@@ -89,32 +90,33 @@ class SessionManager
      *@return broker object if operation is successful
      * an exception shall be thrown.
      */
-    Broker* addBroker(client::ConnectionSettings& settings);
+    QPID_CONSOLE_EXTERN Broker* addBroker(client::ConnectionSettings& settings);
 
     /** Disconnect a broker from the console session
      *
      *@param broker The broker object returned from an earlier call to addBroker.
      */
-    void delBroker(Broker* broker);
+    QPID_CONSOLE_EXTERN void delBroker(Broker* broker);
 
     /** Get a list of known management packages
      *
      *@param packages Vector of package names returned by the session manager.
      */
-    void getPackages(NameVector& packages);
+    QPID_CONSOLE_EXTERN void getPackages(NameVector& packages);
 
     /** Get a list of class keys associated with a package
      *
      *@param classKeys List of class keys returned by the session manager.
      *@param packageName Name of package being queried.
      */
-    void getClasses(KeyVector& classKeys, const std::string& packageName);
+    QPID_CONSOLE_EXTERN void getClasses(KeyVector& classKeys,
+                                        const std::string& packageName);
 
     /** Get the schema of a class given its class key
      *
      *@param classKey Class key of the desired schema.
      */
-    SchemaClass& getSchema(const ClassKey& classKey);
+    QPID_CONSOLE_EXTERN SchemaClass& getSchema(const ClassKey& classKey);
 
     /** Request that updates be received for all classes within a package
      *
@@ -123,7 +125,7 @@ class SessionManager
      *
      *@param packageName Name of the package to which to bind.
      */
-    void bindPackage(const std::string& packageName);
+    QPID_CONSOLE_EXTERN void bindPackage(const std::string& packageName);
 
     /** Request update to be received for a particular class
      *
@@ -132,8 +134,9 @@ class SessionManager
      *
      *@param classKey Class key of class to which to bind.
      */
-    void bindClass(const ClassKey& classKey);
-    void bindClass(const std::string& packageName, const std::string& className);
+    QPID_CONSOLE_EXTERN void bindClass(const ClassKey& classKey);
+    QPID_CONSOLE_EXTERN void bindClass(const std::string& packageName,
+                                       const std::string& className);
 
     /** Get a list of qmf agents known to the session manager.
      *
@@ -141,7 +144,8 @@ class SessionManager
      *@param broker Return agents registered with this broker only.  If NULL, return agents
      * from all connected brokers.
      */
-    void getAgents(Agent::Vector& agents, Broker* broker = 0);
+    QPID_CONSOLE_EXTERN void getAgents(Agent::Vector& agents,
+                                       Broker* broker = 0);
 
     /** Get objects from agents.  There are four variants of this method with different ways of
      * specifying from which class objects are being queried.
@@ -153,8 +157,10 @@ class SessionManager
      *@param broker Restrict the query to this broker, or all brokers if NULL.
      *@param agent Restrict the query to this agent, or all agents if NULL.
      */
-    void getObjects(Object::Vector& objects, const std::string& className,
-                    Broker* broker = 0, Agent* agent = 0);
+    QPID_CONSOLE_EXTERN void getObjects(Object::Vector& objects,
+                                        const std::string& className,
+                                        Broker* broker = 0,
+                                        Agent* agent = 0);
     //void getObjects(Object::Vector& objects, const ClassKey& classKey,
     //                Broker* broker = 0, Agent* agent = 0);
     //void getObjects(Object::Vector& objects, const ObjectId& objectId,