You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by sh...@apache.org on 2011/10/21 16:42:51 UTC
svn commit: r1187375 [4/43] - in /qpid/branches/QPID-2519: ./ bin/ cpp/
cpp/bindings/ cpp/bindings/qmf/python/ cpp/bindings/qmf/ruby/
cpp/bindings/qmf/tests/ cpp/bindings/qmf2/ cpp/bindings/qmf2/examples/cpp/
cpp/bindings/qmf2/python/ cpp/bindings/qmf2...
Modified: qpid/branches/QPID-2519/cpp/examples/qmf-console/printevents.cpp
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/examples/qmf-console/printevents.cpp?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/examples/qmf-console/printevents.cpp (original)
+++ qpid/branches/QPID-2519/cpp/examples/qmf-console/printevents.cpp Fri Oct 21 14:42:12 2011
@@ -64,9 +64,7 @@ struct Main {
Listener listener;
//
- // Declare connection settings for the messaging broker. The settings default to
- // localhost:5672 with user guest (password guest). Refer to the header file
- // <qpid/client/ConnectionSettings.h> for full details.
+ // Declare connection settings for the messaging broker.
//
qpid::client::ConnectionSettings connSettings;
Modified: qpid/branches/QPID-2519/cpp/include/qmf/Agent.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qmf/Agent.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qmf/Agent.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qmf/Agent.h Fri Oct 21 14:42:12 2011
@@ -42,7 +42,7 @@ namespace qmf {
class SchemaId;
class Schema;
- class Agent : public qmf::Handle<AgentImpl> {
+ class QMF_CLASS_EXTERN Agent : public qmf::Handle<AgentImpl> {
public:
QMF_EXTERN Agent(AgentImpl* impl = 0);
QMF_EXTERN Agent(const Agent&);
Modified: qpid/branches/QPID-2519/cpp/include/qmf/AgentEvent.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qmf/AgentEvent.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qmf/AgentEvent.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qmf/AgentEvent.h Fri Oct 21 14:42:12 2011
@@ -46,7 +46,7 @@ namespace qmf {
AGENT_THREAD_FAILED = 8
};
- class AgentEvent : public qmf::Handle<AgentEventImpl> {
+ class QMF_CLASS_EXTERN AgentEvent : public qmf::Handle<AgentEventImpl> {
public:
QMF_EXTERN AgentEvent(AgentEventImpl* impl = 0);
QMF_EXTERN AgentEvent(const AgentEvent&);
Modified: qpid/branches/QPID-2519/cpp/include/qmf/AgentSession.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qmf/AgentSession.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qmf/AgentSession.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qmf/AgentSession.h Fri Oct 21 14:42:12 2011
@@ -40,7 +40,7 @@ namespace qmf {
class Data;
class DataAddr;
- class AgentSession : public qmf::Handle<AgentSessionImpl> {
+ class QMF_CLASS_EXTERN AgentSession : public qmf::Handle<AgentSessionImpl> {
public:
QMF_EXTERN AgentSession(AgentSessionImpl* impl = 0);
QMF_EXTERN AgentSession(const AgentSession&);
@@ -71,15 +71,20 @@ namespace qmf {
* If False: Listen only on the routable direct address
* strict-security:{True,False} - If True: Cooperate with the broker to enforce strict access control to the network
* - If False: Operate more flexibly with regard to use of messaging facilities [default]
+ * max-thread-wait-time:N - Time (in seconds) the session thread will wait for messages from the network between
+ * periodic background processing passes. [default: 5]
+ * Must not be greater than 'interval'. Larger numbers will cause fewer wake-ups but will
+ * increase the time it takes to shut down the process. This setting will not affect the
+ * agent's response time for queries or method invocation.
*/
- QMF_EXTERN AgentSession(qpid::messaging::Connection&, const std::string& options="");
+ QMF_EXTERN AgentSession(qpid::messaging::Connection& conn, const std::string& options="");
/**
* setDomain - Change the QMF domain that this agent will operate in. If this is not called,
* the domain will be "default". Agents in a domain can be seen only by consoles in the same domain.
* This must be called prior to opening the agent session.
*/
- QMF_EXTERN void setDomain(const std::string&);
+ QMF_EXTERN void setDomain(const std::string& domain);
/**
* Set identifying attributes of this agent.
@@ -88,16 +93,16 @@ namespace qmf {
* setInstance - Set the unique instance name (if not set, a UUID will be assigned)
* These must be called prior to opening the agent session.
*/
- QMF_EXTERN void setVendor(const std::string&);
- QMF_EXTERN void setProduct(const std::string&);
- QMF_EXTERN void setInstance(const std::string&);
+ QMF_EXTERN void setVendor(const std::string& vendor);
+ QMF_EXTERN void setProduct(const std::string& product);
+ QMF_EXTERN void setInstance(const std::string& instance);
/**
* setAttribute - Set an arbitrary attribute for this agent. The attributes are not used
* to uniquely identify the agent but can be used as a search criteria when looking for agents.
* This must be called prior to opening the agent session.
*/
- QMF_EXTERN void setAttribute(const std::string&, const qpid::types::Variant&);
+ QMF_EXTERN void setAttribute(const std::string& key, const qpid::types::Variant& value);
/**
* Get the identifying name of the agent.
@@ -119,13 +124,19 @@ namespace qmf {
* Get the next event from the agent session. Events represent actions that must be acted upon by the
* agent application. This method blocks for up to the timeout if there are no events to be handled.
* This method will typically be the focus of the agent application's main execution loop.
+ * If the timeout is set to Duration::IMMEDIATE, the call will not block.
*/
- QMF_EXTERN bool nextEvent(AgentEvent&, qpid::messaging::Duration timeout=qpid::messaging::Duration::FOREVER);
+ QMF_EXTERN bool nextEvent(AgentEvent& outEvent, qpid::messaging::Duration timeout=qpid::messaging::Duration::FOREVER);
+
+ /**
+ * Return the number of events pending for nextEvent. This method will never block.
+ */
+ QMF_EXTERN int pendingEvents() const;
/**
* Register a schema to be exposed by this agent.
*/
- QMF_EXTERN void registerSchema(Schema&);
+ QMF_EXTERN void registerSchema(Schema& schema);
/**
* Add data to be managed internally by the agent. If the option external:True is selected, this call
@@ -138,12 +149,12 @@ namespace qmf {
* across different sessions. If persistent, it is the agent application's
* responsibility to ensure the name is the same each time it is added.
*/
- QMF_EXTERN DataAddr addData(Data&, const std::string& name="", bool persistent=false);
+ QMF_EXTERN DataAddr addData(Data& data, const std::string& name="", bool persistent=false);
/**
* Delete data from internal agent management.
*/
- QMF_EXTERN void delData(const DataAddr&);
+ QMF_EXTERN void delData(const DataAddr& dataAddr);
/**
* The following methods are used to respond to events received in nextEvent.
@@ -155,13 +166,13 @@ namespace qmf {
* complete - Indicate that the response to a query is complete (external:True only)
* methodSuccess - Indicate the successful completion of a method call.
*/
- QMF_EXTERN void authAccept(AgentEvent&);
- QMF_EXTERN void authReject(AgentEvent&, const std::string& diag="");
- QMF_EXTERN void raiseException(AgentEvent&, const std::string&);
- QMF_EXTERN void raiseException(AgentEvent&, const Data&);
- QMF_EXTERN void response(AgentEvent&, const Data&);
- QMF_EXTERN void complete(AgentEvent&);
- QMF_EXTERN void methodSuccess(AgentEvent&);
+ QMF_EXTERN void authAccept(AgentEvent& event);
+ QMF_EXTERN void authReject(AgentEvent& event, const std::string& diag="");
+ QMF_EXTERN void raiseException(AgentEvent& event, const std::string& errorText);
+ QMF_EXTERN void raiseException(AgentEvent& event, const Data& errorData);
+ QMF_EXTERN void response(AgentEvent& event, const Data& responseData);
+ QMF_EXTERN void complete(AgentEvent& event);
+ QMF_EXTERN void methodSuccess(AgentEvent& event);
/**
* Raise an event to be sent into the QMF network.
@@ -177,6 +188,7 @@ namespace qmf {
#ifndef SWIG
private:
friend class qmf::PrivateImplRef<AgentSession>;
+ friend struct AgentSessionImplAccess;
#endif
};
Modified: qpid/branches/QPID-2519/cpp/include/qmf/ConsoleEvent.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qmf/ConsoleEvent.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qmf/ConsoleEvent.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qmf/ConsoleEvent.h Fri Oct 21 14:42:12 2011
@@ -57,7 +57,7 @@ namespace qmf {
AGENT_DEL_FILTER = 2
};
- class ConsoleEvent : public qmf::Handle<ConsoleEventImpl> {
+ class QMF_CLASS_EXTERN ConsoleEvent : public qmf::Handle<ConsoleEventImpl> {
public:
QMF_EXTERN ConsoleEvent(ConsoleEventImpl* impl = 0);
QMF_EXTERN ConsoleEvent(const ConsoleEvent&);
Modified: qpid/branches/QPID-2519/cpp/include/qmf/ConsoleSession.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qmf/ConsoleSession.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qmf/ConsoleSession.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qmf/ConsoleSession.h Fri Oct 21 14:42:12 2011
@@ -38,7 +38,7 @@ namespace qmf {
class ConsoleSessionImpl;
class ConsoleEvent;
- class ConsoleSession : public qmf::Handle<ConsoleSessionImpl> {
+ class QMF_CLASS_EXTERN ConsoleSession : public qmf::Handle<ConsoleSessionImpl> {
public:
QMF_EXTERN ConsoleSession(ConsoleSessionImpl* impl = 0);
QMF_EXTERN ConsoleSession(const ConsoleSession&);
@@ -61,15 +61,53 @@ namespace qmf {
* If False: Listen only on the routable direct address
* strict-security:{True,False} - If True: Cooperate with the broker to enforce strict access control to the network
* - If False: Operate more flexibly with regard to use of messaging facilities [default]
+ * max-thread-wait-time:N - Time (in seconds) the session thread will wait for messages from the network between
+ * periodic background processing passes.
+ * Must not be greater than 60. Larger numbers will cause fewer wake-ups but will
+ * increase the time it takes to shut down the process. [default: 5]
+ */
+ QMF_EXTERN ConsoleSession(qpid::messaging::Connection& conn, const std::string& options="");
+
+ /**
+ * setDomain - Change the QMF domain that this console will operate in. If this is not called,
+ * the domain will be "default". Agents in a domain can be seen only by consoles in the same domain.
+ * This must be called prior to opening the console session.
+ */
+ QMF_EXTERN void setDomain(const std::string& domain);
+ QMF_EXTERN void setAgentFilter(const std::string& filter);
+
+ /**
+ * Open the console session. After opening the session, the domain cannot be changed.
*/
- QMF_EXTERN ConsoleSession(qpid::messaging::Connection&, const std::string& options="");
- QMF_EXTERN void setDomain(const std::string&);
- QMF_EXTERN void setAgentFilter(const std::string&);
QMF_EXTERN void open();
+
+ /**
+ * Close the session. Once closed, the session no longer communicates on the messaging network.
+ */
QMF_EXTERN void close();
- QMF_EXTERN bool nextEvent(ConsoleEvent&, qpid::messaging::Duration timeout=qpid::messaging::Duration::FOREVER);
+
+ /**
+ * Get the next event from the console session. Events represent actions that must be acted upon by the
+ * console application. This method blocks for up to the timeout if there are no events to be handled.
+ * This method will typically be the focus of the console application's main execution loop.
+ * If the timeout is set to Duration::IMMEDIATE, the call will not block.
+ */
+ QMF_EXTERN bool nextEvent(ConsoleEvent& outEvent, qpid::messaging::Duration timeout=qpid::messaging::Duration::FOREVER);
+
+ /**
+ * Return the number of events pending for nextEvent. This method will never block.
+ */
+ QMF_EXTERN int pendingEvents() const;
+
+ /**
+ * getAgentCount, getAgent - Retrieve the set of agents that match the console session's agent filter.
+ */
QMF_EXTERN uint32_t getAgentCount() const;
- QMF_EXTERN Agent getAgent(uint32_t) const;
+ QMF_EXTERN Agent getAgent(uint32_t agentIndex) const;
+
+ /**
+ * Get the agent for the connected broker (i.e. the agent embedded in the broker to which we have a connection).
+ */
QMF_EXTERN Agent getConnectedBrokerAgent() const;
/**
@@ -79,12 +117,13 @@ namespace qmf {
* will involve all known agents. If agentFilter is non-empty, it will be applied only to the set of known
* agents. A subscription cannot be created that involves an agent not known by the session.
*/
- QMF_EXTERN Subscription subscribe(const Query&, const std::string& agentFilter = "", const std::string& options = "");
- QMF_EXTERN Subscription subscribe(const std::string&, const std::string& agentFilter = "", const std::string& options = "");
+ QMF_EXTERN Subscription subscribe(const Query& query, const std::string& agentFilter = "", const std::string& options = "");
+ QMF_EXTERN Subscription subscribe(const std::string& query, const std::string& agentFilter = "", const std::string& options = "");
#ifndef SWIG
private:
friend class qmf::PrivateImplRef<ConsoleSession>;
+ friend struct ConsoleSessionImplAccess;
#endif
};
Modified: qpid/branches/QPID-2519/cpp/include/qmf/Data.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qmf/Data.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qmf/Data.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qmf/Data.h Fri Oct 21 14:42:12 2011
@@ -39,7 +39,7 @@ namespace qmf {
class DataAddr;
class Agent;
- class Data : public qmf::Handle<DataImpl> {
+ class QMF_CLASS_EXTERN Data : public qmf::Handle<DataImpl> {
public:
QMF_EXTERN Data(DataImpl* impl = 0);
QMF_EXTERN Data(const Data&);
Modified: qpid/branches/QPID-2519/cpp/include/qmf/DataAddr.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qmf/DataAddr.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qmf/DataAddr.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qmf/DataAddr.h Fri Oct 21 14:42:12 2011
@@ -34,7 +34,7 @@ namespace qmf {
class DataAddrImpl;
- class DataAddr : public qmf::Handle<DataAddrImpl> {
+ class QMF_CLASS_EXTERN DataAddr : public qmf::Handle<DataAddrImpl> {
public:
QMF_EXTERN DataAddr(DataAddrImpl* impl = 0);
QMF_EXTERN DataAddr(const DataAddr&);
@@ -51,6 +51,9 @@ namespace qmf {
QMF_EXTERN uint32_t getAgentEpoch() const;
QMF_EXTERN qpid::types::Variant::Map asMap() const;
+ QMF_EXTERN bool operator==(const DataAddr&) const;
+ QMF_EXTERN bool operator<(const DataAddr&) const;
+
#ifndef SWIG
private:
friend class qmf::PrivateImplRef<DataAddr>;
Modified: qpid/branches/QPID-2519/cpp/include/qmf/Handle.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qmf/Handle.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qmf/Handle.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qmf/Handle.h Fri Oct 21 14:42:12 2011
@@ -39,22 +39,22 @@ template <class T> class Handle {
public:
/**@return true if handle is valid, i.e. not null. */
- QMF_EXTERN bool isValid() const { return impl; }
+ QMF_INLINE_EXTERN bool isValid() const { return impl; }
/**@return true if handle is null. It is an error to call any function on a null handle. */
- QMF_EXTERN bool isNull() const { return !impl; }
+ QMF_INLINE_EXTERN bool isNull() const { return !impl; }
/** Conversion to bool supports idiom if (handle) { handle->... } */
- QMF_EXTERN operator bool() const { return impl; }
+ QMF_INLINE_EXTERN operator bool() const { return impl; }
/** Operator ! supports idiom if (!handle) { do_if_handle_is_null(); } */
- QMF_EXTERN bool operator !() const { return !impl; }
+ QMF_INLINE_EXTERN bool operator !() const { return !impl; }
void swap(Handle<T>& h) { T* t = h.impl; h.impl = impl; impl = t; }
protected:
typedef T Impl;
- QMF_EXTERN Handle() :impl() {}
+ QMF_INLINE_EXTERN Handle() :impl() {}
// Not implemented,subclasses must implement.
QMF_EXTERN Handle(const Handle&);
Modified: qpid/branches/QPID-2519/cpp/include/qmf/ImportExport.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qmf/ImportExport.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qmf/ImportExport.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qmf/ImportExport.h Fri Oct 21 14:42:12 2011
@@ -20,14 +20,16 @@
* under the License.
*/
-#if defined(WIN32) && !defined(QPID_DECLARE_STATIC)
-# if defined(QMF_EXPORT) || defined (qmfcommon_EXPORTS)
-# define QMF_EXTERN __declspec(dllexport)
-# else
-# define QMF_EXTERN __declspec(dllimport)
-# endif
+#include "qpid/ImportExport.h"
+
+#if defined(QMF_EXPORT) || defined (qmf2_EXPORTS)
+# define QMF_EXTERN QPID_EXPORT
+# define QMF_CLASS_EXTERN QPID_CLASS_EXPORT
+# define QMF_INLINE_EXTERN QPID_INLINE_EXPORT
#else
-# define QMF_EXTERN
+# define QMF_EXTERN QPID_IMPORT
+# define QMF_CLASS_EXTERN QPID_CLASS_IMPORT
+# define QMF_INLINE_EXTERN QPID_INLINE_IMPORT
#endif
#endif
Modified: qpid/branches/QPID-2519/cpp/include/qmf/Query.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qmf/Query.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qmf/Query.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qmf/Query.h Fri Oct 21 14:42:12 2011
@@ -43,7 +43,7 @@ namespace qmf {
QUERY_SCHEMA_ID = 4
};
- class Query : public qmf::Handle<QueryImpl> {
+ class QMF_CLASS_EXTERN Query : public qmf::Handle<QueryImpl> {
public:
QMF_EXTERN Query(QueryImpl* impl = 0);
QMF_EXTERN Query(const Query&);
@@ -65,7 +65,7 @@ namespace qmf {
#ifndef SWIG
private:
friend class qmf::PrivateImplRef<Query>;
- friend class QueryImplAccess;
+ friend struct QueryImplAccess;
#endif
};
Modified: qpid/branches/QPID-2519/cpp/include/qmf/Schema.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qmf/Schema.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qmf/Schema.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qmf/Schema.h Fri Oct 21 14:42:12 2011
@@ -38,7 +38,7 @@ namespace qmf {
class SchemaProperty;
class SchemaMethod;
- class Schema : public qmf::Handle<SchemaImpl> {
+ class QMF_CLASS_EXTERN Schema : public qmf::Handle<SchemaImpl> {
public:
QMF_EXTERN Schema(SchemaImpl* impl = 0);
QMF_EXTERN Schema(const Schema&);
Modified: qpid/branches/QPID-2519/cpp/include/qmf/SchemaId.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qmf/SchemaId.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qmf/SchemaId.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qmf/SchemaId.h Fri Oct 21 14:42:12 2011
@@ -35,7 +35,7 @@ namespace qmf {
class SchemaIdImpl;
- class SchemaId : public qmf::Handle<SchemaIdImpl> {
+ class QMF_CLASS_EXTERN SchemaId : public qmf::Handle<SchemaIdImpl> {
public:
QMF_EXTERN SchemaId(SchemaIdImpl* impl = 0);
QMF_EXTERN SchemaId(const SchemaId&);
Modified: qpid/branches/QPID-2519/cpp/include/qmf/SchemaMethod.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qmf/SchemaMethod.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qmf/SchemaMethod.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qmf/SchemaMethod.h Fri Oct 21 14:42:12 2011
@@ -36,7 +36,7 @@ namespace qmf {
class SchemaMethodImpl;
class SchemaProperty;
- class SchemaMethod : public qmf::Handle<SchemaMethodImpl> {
+ class QMF_CLASS_EXTERN SchemaMethod : public qmf::Handle<SchemaMethodImpl> {
public:
QMF_EXTERN SchemaMethod(SchemaMethodImpl* impl = 0);
QMF_EXTERN SchemaMethod(const SchemaMethod&);
Modified: qpid/branches/QPID-2519/cpp/include/qmf/SchemaProperty.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qmf/SchemaProperty.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qmf/SchemaProperty.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qmf/SchemaProperty.h Fri Oct 21 14:42:12 2011
@@ -36,7 +36,7 @@ namespace qmf {
class SchemaPropertyImpl;
- class SchemaProperty : public Handle<SchemaPropertyImpl> {
+ class QMF_CLASS_EXTERN SchemaProperty : public Handle<SchemaPropertyImpl> {
public:
QMF_EXTERN SchemaProperty(SchemaPropertyImpl* impl = 0);
QMF_EXTERN SchemaProperty(const SchemaProperty&);
Modified: qpid/branches/QPID-2519/cpp/include/qmf/Subscription.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qmf/Subscription.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qmf/Subscription.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qmf/Subscription.h Fri Oct 21 14:42:12 2011
@@ -35,7 +35,7 @@ namespace qmf {
class SubscriptionImpl;
class Data;
- class Subscription : public qmf::Handle<SubscriptionImpl> {
+ class QMF_CLASS_EXTERN Subscription : public qmf::Handle<SubscriptionImpl> {
public:
QMF_EXTERN Subscription(SubscriptionImpl* impl = 0);
QMF_EXTERN Subscription(const Subscription&);
@@ -73,7 +73,7 @@ namespace qmf {
#ifndef SWIG
private:
friend class qmf::PrivateImplRef<Subscription>;
- friend class SubscriptionImplAccess;
+ friend struct SubscriptionImplAccess;
#endif
};
Propchange: qpid/branches/QPID-2519/cpp/include/qmf/engine/Agent.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 14:42:12 2011
@@ -0,0 +1,2 @@
+/qpid/branches/qpid-2935/qpid/cpp/include/qmf/engine/Agent.h:1061302-1072333
+/qpid/trunk/qpid/cpp/include/qmf/engine/Agent.h:1072051-1187351
Propchange: qpid/branches/QPID-2519/cpp/include/qmf/engine/Console.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 14:42:12 2011
@@ -0,0 +1,2 @@
+/qpid/branches/qpid-2935/qpid/cpp/include/qmf/engine/Console.h:1061302-1072333
+/qpid/trunk/qpid/cpp/include/qmf/engine/Console.h:1072051-1187351
Modified: qpid/branches/QPID-2519/cpp/include/qmf/engine/QmfEngineImportExport.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qmf/engine/QmfEngineImportExport.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qmf/engine/QmfEngineImportExport.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qmf/engine/QmfEngineImportExport.h Fri Oct 21 14:42:12 2011
@@ -26,8 +26,17 @@
# else
# define QMFE_EXTERN __declspec(dllimport)
# endif
+# ifdef _MSC_VER
+# define QMFE_CLASS_EXTERN
+# define QMFE_INLINE_EXTERN QMFE_EXTERN
+# else
+# define QMFE_CLASS_EXTERN QMFE_EXTERN
+# define QMFE_INLINE_EXTERN
+# endif
#else
# define QMFE_EXTERN
+# define QMFE_CLASS_EXTERN
+# define QMFE_INLINE_EXTERN
#endif
#endif
Modified: qpid/branches/QPID-2519/cpp/include/qmf/exceptions.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qmf/exceptions.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qmf/exceptions.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qmf/exceptions.h Fri Oct 21 14:42:12 2011
@@ -31,24 +31,24 @@ namespace qmf {
/** \ingroup qmf
*/
- struct QmfException : public qpid::types::Exception {
+ struct QMF_CLASS_EXTERN QmfException : public qpid::types::Exception {
QMF_EXTERN QmfException(const std::string& msg);
QMF_EXTERN virtual ~QmfException() throw();
qpid::types::Variant::Map detail;
};
- struct KeyNotFound : public QmfException {
+ struct QMF_CLASS_EXTERN KeyNotFound : public QmfException {
QMF_EXTERN KeyNotFound(const std::string& msg);
QMF_EXTERN virtual ~KeyNotFound() throw();
};
- struct IndexOutOfRange : public QmfException {
+ struct QMF_CLASS_EXTERN IndexOutOfRange : public QmfException {
QMF_EXTERN IndexOutOfRange();
QMF_EXTERN virtual ~IndexOutOfRange() throw();
};
- struct OperationTimedOut : public QmfException {
+ struct QMF_CLASS_EXTERN OperationTimedOut : public QmfException {
QMF_EXTERN OperationTimedOut();
QMF_EXTERN virtual ~OperationTimedOut() throw();
};
Modified: qpid/branches/QPID-2519/cpp/include/qpid/Address.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qpid/Address.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qpid/Address.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qpid/Address.h Fri Oct 21 14:42:12 2011
@@ -36,7 +36,7 @@ public:
static const std::string TCP; // Default TCP protocol tag.
static const uint16_t AMQP_PORT=5672; // Default AMQP port.
- QPID_COMMON_EXTERN explicit Address(
+ QPID_COMMON_INLINE_EXTERN explicit Address(
const std::string& protocol_=std::string(),
const std::string& host_=std::string(),
uint16_t port_=0
Modified: qpid/branches/QPID-2519/cpp/include/qpid/CommonImportExport.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qpid/CommonImportExport.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qpid/CommonImportExport.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qpid/CommonImportExport.h Fri Oct 21 14:42:12 2011
@@ -20,14 +20,16 @@
* under the License.
*/
-#if defined(WIN32) && !defined(QPID_DECLARE_STATIC)
+#include "qpid/ImportExport.h"
+
#if defined(COMMON_EXPORT) || defined (qpidcommon_EXPORTS)
-#define QPID_COMMON_EXTERN __declspec(dllexport)
-#else
-#define QPID_COMMON_EXTERN __declspec(dllimport)
-#endif
+# define QPID_COMMON_EXTERN QPID_EXPORT
+# define QPID_COMMON_CLASS_EXTERN QPID_CLASS_EXPORT
+# define QPID_COMMON_INLINE_EXTERN QPID_INLINE_EXPORT
#else
-#define QPID_COMMON_EXTERN
+# define QPID_COMMON_EXTERN QPID_IMPORT
+# define QPID_COMMON_CLASS_EXTERN QPID_CLASS_IMPORT
+# define QPID_COMMON_INLINE_EXTERN QPID_INLINE_IMPORT
#endif
#endif
Modified: qpid/branches/QPID-2519/cpp/include/qpid/Exception.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qpid/Exception.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qpid/Exception.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qpid/Exception.h Fri Oct 21 14:42:12 2011
@@ -36,7 +36,7 @@ namespace qpid
/**
* Base class for Qpid runtime exceptions.
*/
-class Exception : public std::exception
+class QPID_COMMON_CLASS_EXTERN Exception : public std::exception
{
public:
QPID_COMMON_EXTERN explicit Exception(const std::string& message=std::string()) throw();
@@ -51,30 +51,30 @@ class Exception : public std::exception
};
/** Exception that includes an errno message. */
-struct ErrnoException : public Exception {
+struct QPID_COMMON_CLASS_EXTERN ErrnoException : public Exception {
ErrnoException(const std::string& msg, int err) : Exception(msg+": "+qpid::sys::strError(err)) {}
ErrnoException(const std::string& msg) : Exception(msg+": "+qpid::sys::strError(errno)) {}
};
-struct SessionException : public Exception {
+struct QPID_COMMON_CLASS_EXTERN SessionException : public Exception {
const framing::execution::ErrorCode code;
SessionException(framing::execution::ErrorCode code_, const std::string& message)
: Exception(message), code(code_) {}
};
-struct ChannelException : public Exception {
+struct QPID_COMMON_CLASS_EXTERN ChannelException : public Exception {
const framing::session::DetachCode code;
ChannelException(framing::session::DetachCode _code, const std::string& message)
: Exception(message), code(_code) {}
};
-struct ConnectionException : public Exception {
+struct QPID_COMMON_CLASS_EXTERN ConnectionException : public Exception {
const framing::connection::CloseCode code;
ConnectionException(framing::connection::CloseCode _code, const std::string& message)
: Exception(message), code(_code) {}
};
-struct ClosedException : public Exception {
+struct QPID_COMMON_CLASS_EXTERN ClosedException : public Exception {
QPID_COMMON_EXTERN ClosedException(const std::string& msg=std::string());
QPID_COMMON_EXTERN std::string getPrefix() const;
};
Modified: qpid/branches/QPID-2519/cpp/include/qpid/Msg.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qpid/Msg.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qpid/Msg.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qpid/Msg.h Fri Oct 21 14:42:12 2011
@@ -24,6 +24,7 @@
#include <sstream>
#include <iostream>
+#include "qpid/types/ImportExport.h"
namespace qpid {
Modified: qpid/branches/QPID-2519/cpp/include/qpid/Options.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qpid/Options.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qpid/Options.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qpid/Options.h Fri Oct 21 14:42:12 2011
@@ -133,77 +133,6 @@ inline po::value_semantic* optValue(bool
-/*
- * ---------------------------------------------
- * Explanation for Boost 103200 conditional code
- * ---------------------------------------------
- *
- * This boost version has an implementation of the program_options library
- * that has no provision for allowing unregistered options to pass by.
- *
- * But that means that, if you have a program that loads optional modules
- * after start-up, and those modules each have their own set of options,
- * then if you parse the command line too soon, you will get spurious
- * reports of unrecognized options -- and the program will exit!
- *
- * And we must process the command-line before module-loading, because we
- * need to look at the "bootstrap" options.
- *
- * This conditional code:
- *
- * 1. implements it's own functor class, derived from the Boost
- * "options_description_easy_init" class. This functor is used
- * to process added options and do the functor chaining, so that
- * I can snoop on the arguments before doing an explicit call
- * to its parent.
- *
- * 2. It implements two static vectors, one to hold long names, and
- * one for short names, so that options declared by modules are
- * not forgotten when their options_description goes out of scope.
- *
- * I will be thrilled to personally delete this code if we ever decide
- * that qpid doesn't really need to support this antique version of Boost.
- *
- */
-
-#if ( BOOST_VERSION == 103200 )
-struct Options;
-
-
-struct
-options_description_less_easy_init
- : public po::options_description_easy_init
-{
- options_description_less_easy_init ( Options * my_owner,
- po::options_description * my_parents_owner
- )
- : po::options_description_easy_init(my_parents_owner)
- {
- owner = my_owner;
- }
-
-
- options_description_less_easy_init&
- operator()(char const * name,
- char const * description);
-
-
- options_description_less_easy_init&
- operator()(char const * name,
- const po::value_semantic* s);
-
-
- options_description_less_easy_init&
- operator()(const char* name,
- const po::value_semantic* s,
- const char* description);
-
-
- Options * owner;
-};
-#endif
-
-
struct Options : public po::options_description {
struct Exception : public qpid::Exception {
@@ -222,26 +151,9 @@ struct Options : public po::options_desc
bool allowUnknown = false);
- #if ( BOOST_VERSION == 103200 )
- options_description_less_easy_init m_less_easy;
-
- options_description_less_easy_init addOptions() {
- return m_less_easy;
- }
-
- bool
- is_registered_option ( std::string s );
-
- void
- register_names ( std::string s );
-
- static std::vector<std::string> long_names;
- static std::vector<std::string> short_names;
- #else
boost::program_options::options_description_easy_init addOptions() {
return add_options();
}
- #endif
};
Modified: qpid/branches/QPID-2519/cpp/include/qpid/Url.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qpid/Url.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qpid/Url.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qpid/Url.h Fri Oct 21 14:42:12 2011
@@ -66,7 +66,7 @@ struct Url : public std::vector<Address>
*@exception Invalid if the url is invalid.
*/
QPID_COMMON_EXTERN void parse(const char* url);
- QPID_COMMON_EXTERN void parse(const std::string& url) { parse(url.c_str()); }
+ QPID_COMMON_INLINE_EXTERN void parse(const std::string& url) { parse(url.c_str()); }
/** Replace contesnts with parsed URL. Replace with empty URL if invalid. */
QPID_COMMON_EXTERN void parseNoThrow(const char* url);
Modified: qpid/branches/QPID-2519/cpp/include/qpid/agent/ManagementAgent.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qpid/agent/ManagementAgent.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qpid/agent/ManagementAgent.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qpid/agent/ManagementAgent.h Fri Oct 21 14:42:12 2011
@@ -110,8 +110,8 @@ class ManagementAgent
uint16_t intervalSeconds = 10,
bool useExternalThread = false,
const std::string& storeFile = "",
- const std::string& uid = "guest",
- const std::string& pwd = "guest",
+ const std::string& uid = "",
+ const std::string& pwd = "",
const std::string& mech = "PLAIN",
const std::string& proto = "tcp") = 0;
Modified: qpid/branches/QPID-2519/cpp/include/qpid/agent/QmfAgentImportExport.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qpid/agent/QmfAgentImportExport.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qpid/agent/QmfAgentImportExport.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qpid/agent/QmfAgentImportExport.h Fri Oct 21 14:42:12 2011
@@ -20,14 +20,16 @@
* under the License.
*/
-#if defined(WIN32) && !defined(QPID_DECLARE_STATIC)
-#if defined (qmf_EXPORTS)
-#define QMF_AGENT_EXTERN __declspec(dllexport)
-#else
-#define QMF_AGENT_EXTERN __declspec(dllimport)
-#endif
+#include "qpid/ImportExport.h"
+
+#if defined(QMF_EXPORT) || defined (qmf_EXPORTS)
+# define QMF_AGENT_EXTERN QPID_EXPORT
+# define QMF_AGENT_CLASS_EXTERN QPID_CLASS_EXPORT
+# define QMF_AGENT_INLINE_EXTERN QPID_INLINE_EXPORT
#else
-#define QMF_AGENT_EXTERN
+# define QMF_AGENT_EXTERN QPID_IMPORT
+# define QMF_AGENT_CLASS_EXTERN QPID_CLASS_IMPORT
+# define QMF_AGENT_INLINE_EXTERN QPID_INLINE_IMPORT
#endif
#endif
Modified: qpid/branches/QPID-2519/cpp/include/qpid/amqp_0_10/Codecs.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qpid/amqp_0_10/Codecs.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qpid/amqp_0_10/Codecs.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qpid/amqp_0_10/Codecs.h Fri Oct 21 14:42:12 2011
@@ -34,14 +34,14 @@ namespace amqp_0_10 {
* Codec for encoding/decoding a map of Variants using the AMQP 0-10
* map encoding.
*/
-class QPID_COMMON_EXTERN MapCodec
+class QPID_COMMON_CLASS_EXTERN MapCodec
{
public:
typedef qpid::types::Variant::Map ObjectType;
- static void encode(const ObjectType&, std::string&);
- static void decode(const std::string&, ObjectType&);
- static size_t encodedSize(const ObjectType&);
- static const std::string contentType;
+ static void QPID_COMMON_EXTERN encode(const ObjectType&, std::string&);
+ static void QPID_COMMON_EXTERN decode(const std::string&, ObjectType&);
+ static size_t QPID_COMMON_EXTERN encodedSize(const ObjectType&);
+ static const QPID_COMMON_EXTERN std::string contentType;
private:
};
@@ -49,14 +49,14 @@ class QPID_COMMON_EXTERN MapCodec
* Codec for encoding/decoding a list of Variants using the AMQP 0-10
* list encoding.
*/
-class QPID_COMMON_EXTERN ListCodec
+class QPID_COMMON_CLASS_EXTERN ListCodec
{
public:
typedef qpid::types::Variant::List ObjectType;
- static void encode(const ObjectType&, std::string&);
- static void decode(const std::string&, ObjectType&);
- static size_t encodedSize(const ObjectType&);
- static const std::string contentType;
+ static void QPID_COMMON_EXTERN encode(const ObjectType&, std::string&);
+ static void QPID_COMMON_EXTERN decode(const std::string&, ObjectType&);
+ static size_t QPID_COMMON_EXTERN encodedSize(const ObjectType&);
+ static const QPID_COMMON_EXTERN std::string contentType;
private:
};
Modified: qpid/branches/QPID-2519/cpp/include/qpid/client/ClientImportExport.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qpid/client/ClientImportExport.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qpid/client/ClientImportExport.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qpid/client/ClientImportExport.h Fri Oct 21 14:42:12 2011
@@ -20,14 +20,16 @@
* under the License.
*/
-#if defined(WIN32) && !defined(QPID_DECLARE_STATIC)
+#include "qpid/ImportExport.h"
+
#if defined(CLIENT_EXPORT) || defined (qpidclient_EXPORTS)
-#define QPID_CLIENT_EXTERN __declspec(dllexport)
-#else
-#define QPID_CLIENT_EXTERN __declspec(dllimport)
-#endif
+# define QPID_CLIENT_EXTERN QPID_EXPORT
+# define QPID_CLIENT_CLASS_EXTERN QPID_CLASS_EXPORT
+# define QPID_CLIENT_INLINE_EXTERN QPID_INLINE_EXPORT
#else
-#define QPID_CLIENT_EXTERN
+# define QPID_CLIENT_EXTERN QPID_IMPORT
+# define QPID_CLIENT_CLASS_EXTERN QPID_CLASS_IMPORT
+# define QPID_CLIENT_INLINE_EXTERN QPID_INLINE_IMPORT
#endif
#endif
Modified: qpid/branches/QPID-2519/cpp/include/qpid/client/Completion.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qpid/client/Completion.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qpid/client/Completion.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qpid/client/Completion.h Fri Oct 21 14:42:12 2011
@@ -41,7 +41,7 @@ template <class T> class PrivateImplRef;
*
*\ingroup clientapi
*/
-class Completion : public Handle<CompletionImpl>
+class QPID_CLIENT_CLASS_EXTERN Completion : public Handle<CompletionImpl>
{
public:
QPID_CLIENT_EXTERN Completion(CompletionImpl* = 0);
Modified: qpid/branches/QPID-2519/cpp/include/qpid/client/Connection.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qpid/client/Connection.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qpid/client/Connection.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qpid/client/Connection.h Fri Oct 21 14:42:12 2011
@@ -60,7 +60,7 @@ class ConnectionImpl;
*
*/
-class Connection
+class QPID_CLIENT_CLASS_EXTERN Connection
{
framing::ProtocolVersion version;
@@ -102,8 +102,8 @@ class Connection
* within a single broker).
*/
QPID_CLIENT_EXTERN void open(const std::string& host, int port = 5672,
- const std::string& uid = "guest",
- const std::string& pwd = "guest",
+ const std::string& uid = "",
+ const std::string& pwd = "",
const std::string& virtualhost = "/", uint16_t maxFrameSize=65535);
/**
@@ -124,8 +124,8 @@ class Connection
* within a single broker).
*/
QPID_CLIENT_EXTERN void open(const Url& url,
- const std::string& uid = "guest",
- const std::string& pwd = "guest",
+ const std::string& uid = "",
+ const std::string& pwd = "",
const std::string& virtualhost = "/", uint16_t maxFrameSize=65535);
/**
Modified: qpid/branches/QPID-2519/cpp/include/qpid/client/ConnectionSettings.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qpid/client/ConnectionSettings.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qpid/client/ConnectionSettings.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qpid/client/ConnectionSettings.h Fri Oct 21 14:42:12 2011
@@ -37,7 +37,7 @@ namespace client {
/**
* Settings for a Connection.
*/
-struct ConnectionSettings {
+struct QPID_CLIENT_CLASS_EXTERN ConnectionSettings {
QPID_CLIENT_EXTERN ConnectionSettings();
QPID_CLIENT_EXTERN virtual ~ConnectionSettings();
Modified: qpid/branches/QPID-2519/cpp/include/qpid/client/FailoverListener.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qpid/client/FailoverListener.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qpid/client/FailoverListener.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qpid/client/FailoverListener.h Fri Oct 21 14:42:12 2011
@@ -48,7 +48,7 @@ namespace client {
* FailoverListener::decode to extract a list of broker URLs from a
* failover exchange message.
*/
-class FailoverListener : private MessageListener, private qpid::sys::Runnable
+class QPID_CLIENT_CLASS_EXTERN FailoverListener : private MessageListener, private qpid::sys::Runnable
{
public:
/** The name of the standard failover exchange amq.failover */
Modified: qpid/branches/QPID-2519/cpp/include/qpid/client/FailoverManager.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qpid/client/FailoverManager.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qpid/client/FailoverManager.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qpid/client/FailoverManager.h Fri Oct 21 14:42:12 2011
@@ -42,7 +42,7 @@ struct CannotConnectException : qpid::Ex
/**
* Utility to manage failover.
*/
-class FailoverManager
+class QPID_CLIENT_CLASS_EXTERN FailoverManager
{
public:
/**
Modified: qpid/branches/QPID-2519/cpp/include/qpid/client/Future.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qpid/client/Future.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qpid/client/Future.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qpid/client/Future.h Fri Oct 21 14:42:12 2011
@@ -34,7 +34,7 @@ namespace qpid {
namespace client {
/**@internal */
-class Future
+class QPID_CLIENT_CLASS_EXTERN Future
{
framing::SequenceNumber command;
boost::shared_ptr<FutureResult> result;
Modified: qpid/branches/QPID-2519/cpp/include/qpid/client/FutureResult.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qpid/client/FutureResult.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qpid/client/FutureResult.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qpid/client/FutureResult.h Fri Oct 21 14:42:12 2011
@@ -34,7 +34,7 @@ namespace client {
class SessionImpl;
///@internal
-class FutureResult : public FutureCompletion
+class QPID_CLIENT_CLASS_EXTERN FutureResult : public FutureCompletion
{
std::string result;
public:
Modified: qpid/branches/QPID-2519/cpp/include/qpid/client/Handle.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qpid/client/Handle.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qpid/client/Handle.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qpid/client/Handle.h Fri Oct 21 14:42:12 2011
@@ -40,22 +40,22 @@ template <class T> class Handle {
public:
/**@return true if handle is valid, i.e. not null. */
- QPID_CLIENT_EXTERN bool isValid() const { return impl; }
+ QPID_CLIENT_INLINE_EXTERN bool isValid() const { return impl; }
/**@return true if handle is null. It is an error to call any function on a null handle. */
- QPID_CLIENT_EXTERN bool isNull() const { return !impl; }
+ QPID_CLIENT_INLINE_EXTERN bool isNull() const { return !impl; }
/** Conversion to bool supports idiom if (handle) { handle->... } */
- QPID_CLIENT_EXTERN operator bool() const { return impl; }
+ QPID_CLIENT_INLINE_EXTERN operator bool() const { return impl; }
/** Operator ! supports idiom if (!handle) { do_if_handle_is_null(); } */
- QPID_CLIENT_EXTERN bool operator !() const { return !impl; }
+ QPID_CLIENT_INLINE_EXTERN bool operator !() const { return !impl; }
void swap(Handle<T>& h) { T* t = h.impl; h.impl = impl; impl = t; }
protected:
typedef T Impl;
- QPID_CLIENT_EXTERN Handle() :impl() {}
+ QPID_CLIENT_INLINE_EXTERN Handle() :impl() {}
// Not implemented,subclasses must implement.
QPID_CLIENT_EXTERN Handle(const Handle&);
Modified: qpid/branches/QPID-2519/cpp/include/qpid/client/LocalQueue.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qpid/client/LocalQueue.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qpid/client/LocalQueue.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qpid/client/LocalQueue.h Fri Oct 21 14:42:12 2011
@@ -71,7 +71,7 @@ template <class T> class PrivateImplRef;
* </ul>
*/
-class LocalQueue : public Handle<LocalQueueImpl> {
+class QPID_CLIENT_CLASS_EXTERN LocalQueue : public Handle<LocalQueueImpl> {
public:
/** Create a local queue. Subscribe the local queue to a remote broker
* queue with a SubscriptionManager.
Modified: qpid/branches/QPID-2519/cpp/include/qpid/client/Message.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qpid/client/Message.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qpid/client/Message.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qpid/client/Message.h Fri Oct 21 14:42:12 2011
@@ -112,7 +112,7 @@ class MessageImpl;
*
*
*/
-class Message
+class QPID_CLIENT_CLASS_EXTERN Message
{
public:
/** Create a Message.
Modified: qpid/branches/QPID-2519/cpp/include/qpid/client/MessageListener.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qpid/client/MessageListener.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qpid/client/MessageListener.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qpid/client/MessageListener.h Fri Oct 21 14:42:12 2011
@@ -84,7 +84,7 @@ namespace client {
*
*/
- class MessageListener{
+ class QPID_CLIENT_CLASS_EXTERN MessageListener{
public:
QPID_CLIENT_EXTERN virtual ~MessageListener();
Modified: qpid/branches/QPID-2519/cpp/include/qpid/client/MessageReplayTracker.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qpid/client/MessageReplayTracker.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qpid/client/MessageReplayTracker.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qpid/client/MessageReplayTracker.h Fri Oct 21 14:42:12 2011
@@ -34,7 +34,7 @@ namespace client {
* Utility to track messages sent asynchronously, allowing those that
* are indoubt to be replayed over a new session.
*/
-class MessageReplayTracker
+class QPID_CLIENT_CLASS_EXTERN MessageReplayTracker
{
public:
QPID_CLIENT_EXTERN MessageReplayTracker(uint flushInterval);
Modified: qpid/branches/QPID-2519/cpp/include/qpid/client/QueueOptions.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qpid/client/QueueOptions.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qpid/client/QueueOptions.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qpid/client/QueueOptions.h Fri Oct 21 14:42:12 2011
@@ -35,7 +35,7 @@ enum QueueOrderingPolicy {FIFO, LVQ, LVQ
* A help class to set options on the Queue. Create a configured args while
* still allowing any custom configuration via the FieldTable base class
*/
-class QueueOptions: public framing::FieldTable
+class QPID_CLIENT_CLASS_EXTERN QueueOptions: public framing::FieldTable
{
public:
QPID_CLIENT_EXTERN QueueOptions();
Modified: qpid/branches/QPID-2519/cpp/include/qpid/client/SessionBase_0_10.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qpid/client/SessionBase_0_10.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qpid/client/SessionBase_0_10.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qpid/client/SessionBase_0_10.h Fri Oct 21 14:42:12 2011
@@ -54,7 +54,7 @@ enum CreditUnit { MESSAGE_CREDIT=0, BYTE
* Subclasses provide the AMQP commands for a given
* version of the protocol.
*/
-class SessionBase_0_10 {
+class QPID_CLIENT_CLASS_EXTERN SessionBase_0_10 {
public:
///@internal
Modified: qpid/branches/QPID-2519/cpp/include/qpid/client/Subscription.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qpid/client/Subscription.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qpid/client/Subscription.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qpid/client/Subscription.h Fri Oct 21 14:42:12 2011
@@ -39,7 +39,7 @@ class SubscriptionManager;
* A handle to an active subscription. Provides methods to query the subscription status
* and control acknowledgement (acquire and accept) of messages.
*/
-class Subscription : public Handle<SubscriptionImpl> {
+class QPID_CLIENT_CLASS_EXTERN Subscription : public Handle<SubscriptionImpl> {
public:
QPID_CLIENT_EXTERN Subscription(SubscriptionImpl* = 0);
QPID_CLIENT_EXTERN Subscription(const Subscription&);
@@ -91,13 +91,13 @@ class Subscription : public Handle<Subsc
QPID_CLIENT_EXTERN void release(const SequenceSet& messageIds);
/* Acquire a single message */
- QPID_CLIENT_EXTERN void acquire(const Message& m) { acquire(SequenceSet(m.getId())); }
+ QPID_CLIENT_INLINE_EXTERN void acquire(const Message& m) { acquire(SequenceSet(m.getId())); }
/* Accept a single message */
- QPID_CLIENT_EXTERN void accept(const Message& m) { accept(SequenceSet(m.getId())); }
+ QPID_CLIENT_INLINE_EXTERN void accept(const Message& m) { accept(SequenceSet(m.getId())); }
/* Release a single message */
- QPID_CLIENT_EXTERN void release(const Message& m) { release(SequenceSet(m.getId())); }
+ QPID_CLIENT_INLINE_EXTERN void release(const Message& m) { release(SequenceSet(m.getId())); }
/** Get the session associated with this subscription */
QPID_CLIENT_EXTERN Session getSession() const;
Modified: qpid/branches/QPID-2519/cpp/include/qpid/client/SubscriptionManager.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qpid/client/SubscriptionManager.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qpid/client/SubscriptionManager.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qpid/client/SubscriptionManager.h Fri Oct 21 14:42:12 2011
@@ -94,7 +94,7 @@ class SubscriptionManagerImpl;
* </ul>
*
*/
-class SubscriptionManager : public sys::Runnable, public Handle<SubscriptionManagerImpl>
+class QPID_CLIENT_CLASS_EXTERN SubscriptionManager : public sys::Runnable, public Handle<SubscriptionManagerImpl>
{
public:
/** Create a new SubscriptionManager associated with a session */
Modified: qpid/branches/QPID-2519/cpp/include/qpid/console/Agent.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qpid/console/Agent.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qpid/console/Agent.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qpid/console/Agent.h Fri Oct 21 14:42:12 2011
@@ -31,17 +31,17 @@ namespace console {
*
* \ingroup qmfconsoleapi
*/
- class QPID_CONSOLE_EXTERN Agent {
+ class QPID_CONSOLE_CLASS_EXTERN Agent {
public:
typedef std::vector<Agent*> Vector;
- Agent(Broker* _broker, uint32_t _bank, const std::string& _label) :
+ QPID_CONSOLE_INLINE_EXTERN Agent(Broker* _broker, uint32_t _bank, const std::string& _label) :
broker(_broker), brokerBank(broker->getBrokerBank()),
agentBank(_bank), label(_label) {}
- Broker* getBroker() const { return broker; }
- uint32_t getBrokerBank() const { return brokerBank; }
- uint32_t getAgentBank() const { return agentBank; }
- const std::string& getLabel() const { return label; }
+ QPID_CONSOLE_INLINE_EXTERN Broker* getBroker() const { return broker; }
+ QPID_CONSOLE_INLINE_EXTERN uint32_t getBrokerBank() const { return brokerBank; }
+ QPID_CONSOLE_INLINE_EXTERN uint32_t getAgentBank() const { return agentBank; }
+ QPID_CONSOLE_INLINE_EXTERN const std::string& getLabel() const { return label; }
private:
Broker* broker;
@@ -50,7 +50,7 @@ namespace console {
const std::string label;
};
- QPID_CONSOLE_EXTERN std::ostream& operator<<(std::ostream& o, const Agent& agent);
+ std::ostream& operator<<(std::ostream& o, const Agent& agent);
}
}
Modified: qpid/branches/QPID-2519/cpp/include/qpid/console/Broker.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qpid/console/Broker.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qpid/console/Broker.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qpid/console/Broker.h Fri Oct 21 14:42:12 2011
@@ -55,12 +55,12 @@ namespace console {
client::ConnectionSettings& settings);
QPID_CONSOLE_EXTERN ~Broker();
- QPID_CONSOLE_EXTERN bool isConnected() const { return connected; }
- QPID_CONSOLE_EXTERN const std::string& getError() const { return error; }
- QPID_CONSOLE_EXTERN const std::string& getSessionId() const { return amqpSessionId; }
- QPID_CONSOLE_EXTERN const framing::Uuid& getBrokerId() const { return brokerId; }
- QPID_CONSOLE_EXTERN uint32_t getBrokerBank() const { return 1; }
- QPID_CONSOLE_EXTERN void addBinding(const std::string& key) {
+ QPID_CONSOLE_INLINE_EXTERN bool isConnected() const { return connected; }
+ QPID_CONSOLE_INLINE_EXTERN const std::string& getError() const { return error; }
+ QPID_CONSOLE_INLINE_EXTERN const std::string& getSessionId() const { return amqpSessionId; }
+ QPID_CONSOLE_INLINE_EXTERN const framing::Uuid& getBrokerId() const { return brokerId; }
+ QPID_CONSOLE_INLINE_EXTERN uint32_t getBrokerBank() const { return 1; }
+ QPID_CONSOLE_INLINE_EXTERN void addBinding(const std::string& key) {
connThreadBody.bindExchange("qpid.management", key);
}
QPID_CONSOLE_EXTERN std::string getUrl() const;
@@ -123,10 +123,10 @@ namespace console {
void setBrokerId(const framing::Uuid& id) { brokerId = id; }
void appendAgents(std::vector<Agent*>& agents) const;
- friend QPID_CONSOLE_EXTERN std::ostream& operator<<(std::ostream& o, const Broker& k);
+ friend std::ostream& operator<<(std::ostream& o, const Broker& k);
};
- QPID_CONSOLE_EXTERN std::ostream& operator<<(std::ostream& o, const Broker& k);
+ std::ostream& operator<<(std::ostream& o, const Broker& k);
}
}
Modified: qpid/branches/QPID-2519/cpp/include/qpid/console/ClassKey.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qpid/console/ClassKey.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qpid/console/ClassKey.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qpid/console/ClassKey.h Fri Oct 21 14:42:12 2011
@@ -33,24 +33,24 @@ namespace console {
*
* \ingroup qmfconsoleapi
*/
- class QPID_CONSOLE_EXTERN ClassKey {
+ class QPID_CONSOLE_CLASS_EXTERN ClassKey {
public:
- static const int HASH_SIZE = 16;
+ QPID_CONSOLE_EXTERN static const int HASH_SIZE = 16;
- ClassKey(const std::string& package, const std::string& name, const uint8_t* hash);
+ QPID_CONSOLE_EXTERN ClassKey(const std::string& package, const std::string& name, const uint8_t* hash);
- const std::string& getPackageName() const { return package; }
- const std::string& getClassName() const { return name; }
- const uint8_t* getHash() const { return hash; }
- std::string getHashString() const;
- std::string str() const;
- bool operator==(const ClassKey& other) const;
- bool operator!=(const ClassKey& other) const;
- bool operator<(const ClassKey& other) const;
- bool operator>(const ClassKey& other) const;
- bool operator<=(const ClassKey& other) const;
- bool operator>=(const ClassKey& other) const;
- void encode(framing::Buffer& buffer) const;
+ const QPID_CONSOLE_EXTERN std::string& getPackageName() const { return package; }
+ const QPID_CONSOLE_EXTERN std::string& getClassName() const { return name; }
+ const QPID_CONSOLE_EXTERN uint8_t* getHash() const { return hash; }
+ QPID_CONSOLE_EXTERN std::string getHashString() const;
+ QPID_CONSOLE_EXTERN std::string str() const;
+ QPID_CONSOLE_EXTERN bool operator==(const ClassKey& other) const;
+ QPID_CONSOLE_EXTERN bool operator!=(const ClassKey& other) const;
+ QPID_CONSOLE_EXTERN bool operator<(const ClassKey& other) const;
+ QPID_CONSOLE_EXTERN bool operator>(const ClassKey& other) const;
+ QPID_CONSOLE_EXTERN bool operator<=(const ClassKey& other) const;
+ QPID_CONSOLE_EXTERN bool operator>=(const ClassKey& other) const;
+ QPID_CONSOLE_EXTERN void encode(framing::Buffer& buffer) const;
private:
std::string package;
Modified: qpid/branches/QPID-2519/cpp/include/qpid/console/ConsoleImportExport.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qpid/console/ConsoleImportExport.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qpid/console/ConsoleImportExport.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qpid/console/ConsoleImportExport.h Fri Oct 21 14:42:12 2011
@@ -20,14 +20,16 @@
* under the License.
*/
-#if defined(WIN32) && !defined(QPID_DECLARE_STATIC)
+#include "qpid/ImportExport.h"
+
#if defined(CONSOLE_EXPORT) || defined (qmfconsole_EXPORTS)
-#define QPID_CONSOLE_EXTERN __declspec(dllexport)
-#else
-#define QPID_CONSOLE_EXTERN __declspec(dllimport)
-#endif
+# define QPID_CONSOLE_EXTERN QPID_EXPORT
+# define QPID_CONSOLE_CLASS_EXTERN QPID_CLASS_EXPORT
+# define QPID_CONSOLE_INLINE_EXTERN QPID_INLINE_EXPORT
#else
-#define QPID_CONSOLE_EXTERN
+# define QPID_CONSOLE_EXTERN QPID_IMPORT
+# define QPID_CONSOLE_CLASS_EXTERN QPID_CLASS_IMPORT
+# define QPID_CONSOLE_INLINE_EXTERN QPID_INLINE_IMPORT
#endif
#endif
Modified: qpid/branches/QPID-2519/cpp/include/qpid/console/ObjectId.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qpid/console/ObjectId.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qpid/console/ObjectId.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qpid/console/ObjectId.h Fri Oct 21 14:42:12 2011
@@ -40,10 +40,10 @@ namespace console {
ObjectId() : first(0), second(0) {}
ObjectId(framing::Buffer& buffer);
- uint8_t getFlags() const { return (first & 0xF000000000000000LL) >> 60; }
- uint16_t getSequence() const { return (first & 0x0FFF000000000000LL) >> 48; }
- uint32_t getBrokerBank() const { return (first & 0x0000FFFFF0000000LL) >> 28; }
- uint32_t getAgentBank() const { return first & 0x000000000FFFFFFFLL; }
+ uint8_t getFlags() const { return (uint8_t)((first & 0xF000000000000000LL) >> 60); }
+ uint16_t getSequence() const { return (uint16_t)((first & 0x0FFF000000000000LL) >> 48); }
+ uint32_t getBrokerBank() const { return (uint32_t)((first & 0x0000FFFFF0000000LL) >> 28); }
+ uint32_t getAgentBank() const { return (uint32_t) (first & 0x000000000FFFFFFFLL); }
uint64_t getObject() const { return second; }
bool isDurable() const { return getSequence() == 0; }
void decode(framing::Buffer& buffer);
Modified: qpid/branches/QPID-2519/cpp/include/qpid/framing/Array.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qpid/framing/Array.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qpid/framing/Array.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qpid/framing/Array.h Fri Oct 21 14:42:12 2011
@@ -34,7 +34,7 @@ namespace framing {
class Buffer;
-class Array
+class QPID_COMMON_CLASS_EXTERN Array
{
public:
typedef boost::shared_ptr<FieldValue> ValuePtr;
@@ -55,25 +55,25 @@ class Array
//creates a longstr array
QPID_COMMON_EXTERN Array(const std::vector<std::string>& in);
- QPID_COMMON_EXTERN TypeCode getType() const { return type; }
+ QPID_COMMON_INLINE_EXTERN TypeCode getType() const { return type; }
// std collection interface.
- QPID_COMMON_EXTERN const_iterator begin() const { return values.begin(); }
- QPID_COMMON_EXTERN const_iterator end() const { return values.end(); }
- QPID_COMMON_EXTERN iterator begin() { return values.begin(); }
- QPID_COMMON_EXTERN iterator end(){ return values.end(); }
-
- QPID_COMMON_EXTERN ValuePtr front() const { return values.front(); }
- QPID_COMMON_EXTERN ValuePtr back() const { return values.back(); }
- QPID_COMMON_EXTERN size_t size() const { return values.size(); }
+ QPID_COMMON_INLINE_EXTERN const_iterator begin() const { return values.begin(); }
+ QPID_COMMON_INLINE_EXTERN const_iterator end() const { return values.end(); }
+ QPID_COMMON_INLINE_EXTERN iterator begin() { return values.begin(); }
+ QPID_COMMON_INLINE_EXTERN iterator end(){ return values.end(); }
+
+ QPID_COMMON_INLINE_EXTERN ValuePtr front() const { return values.front(); }
+ QPID_COMMON_INLINE_EXTERN ValuePtr back() const { return values.back(); }
+ QPID_COMMON_INLINE_EXTERN size_t size() const { return values.size(); }
QPID_COMMON_EXTERN void insert(iterator i, ValuePtr value);
- QPID_COMMON_EXTERN void erase(iterator i) { values.erase(i); }
- QPID_COMMON_EXTERN void push_back(ValuePtr value) { values.insert(end(), value); }
- QPID_COMMON_EXTERN void pop_back() { values.pop_back(); }
+ QPID_COMMON_INLINE_EXTERN void erase(iterator i) { values.erase(i); }
+ QPID_COMMON_INLINE_EXTERN void push_back(ValuePtr value) { values.insert(end(), value); }
+ QPID_COMMON_INLINE_EXTERN void pop_back() { values.pop_back(); }
// Non-std interface
- QPID_COMMON_EXTERN void add(ValuePtr value) { push_back(value); }
+ QPID_COMMON_INLINE_EXTERN void add(ValuePtr value) { push_back(value); }
template <class T>
void collect(std::vector<T>& out) const
Modified: qpid/branches/QPID-2519/cpp/include/qpid/framing/Buffer.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qpid/framing/Buffer.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qpid/framing/Buffer.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qpid/framing/Buffer.h Fri Oct 21 14:42:12 2011
@@ -29,14 +29,14 @@
namespace qpid {
namespace framing {
-struct OutOfBounds : qpid::Exception {
+struct QPID_COMMON_CLASS_EXTERN OutOfBounds : qpid::Exception {
OutOfBounds() : qpid::Exception(std::string("Out of Bounds")) {}
};
class Content;
class FieldTable;
-class Buffer
+class QPID_COMMON_CLASS_EXTERN Buffer
{
uint32_t size;
char* data;
@@ -72,12 +72,12 @@ class Buffer
QPID_COMMON_EXTERN void restore(bool reRecord = false);
QPID_COMMON_EXTERN void reset();
- QPID_COMMON_EXTERN uint32_t available() { return size - position; }
- QPID_COMMON_EXTERN uint32_t getSize() { return size; }
- QPID_COMMON_EXTERN uint32_t getPosition() { return position; }
- QPID_COMMON_EXTERN void setPosition(uint32_t p) { position = p; }
- QPID_COMMON_EXTERN Iterator getIterator() { return Iterator(*this); }
- QPID_COMMON_EXTERN char* getPointer() { return data; }
+ QPID_COMMON_INLINE_EXTERN uint32_t available() { return size - position; }
+ QPID_COMMON_INLINE_EXTERN uint32_t getSize() { return size; }
+ QPID_COMMON_INLINE_EXTERN uint32_t getPosition() { return position; }
+ QPID_COMMON_INLINE_EXTERN void setPosition(uint32_t p) { position = p; }
+ QPID_COMMON_INLINE_EXTERN Iterator getIterator() { return Iterator(*this); }
+ QPID_COMMON_INLINE_EXTERN char* getPointer() { return data; }
QPID_COMMON_EXTERN void putOctet(uint8_t i);
QPID_COMMON_EXTERN void putShort(uint16_t i);
Modified: qpid/branches/QPID-2519/cpp/include/qpid/framing/FieldTable.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qpid/framing/FieldTable.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qpid/framing/FieldTable.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qpid/framing/FieldTable.h Fri Oct 21 14:42:12 2011
@@ -56,7 +56,7 @@ class FieldTable
typedef ValueMap::reference reference;
typedef ValueMap::value_type value_type;
- QPID_COMMON_EXTERN FieldTable() {};
+ QPID_COMMON_INLINE_EXTERN FieldTable() {};
QPID_COMMON_EXTERN FieldTable(const FieldTable& ft);
QPID_COMMON_EXTERN ~FieldTable();
QPID_COMMON_EXTERN FieldTable& operator=(const FieldTable& ft);
@@ -65,9 +65,11 @@ class FieldTable
QPID_COMMON_EXTERN void decode(Buffer& buffer);
QPID_COMMON_EXTERN int count() const;
+ QPID_COMMON_INLINE_EXTERN size_t size() const { return values.size(); }
+ QPID_COMMON_INLINE_EXTERN bool empty() { return size() == 0; }
QPID_COMMON_EXTERN void set(const std::string& name, const ValuePtr& value);
QPID_COMMON_EXTERN ValuePtr get(const std::string& name) const;
- QPID_COMMON_EXTERN bool isSet(const std::string& name) const { return get(name).get() != 0; }
+ QPID_COMMON_INLINE_EXTERN bool isSet(const std::string& name) const { return get(name).get() != 0; }
QPID_COMMON_EXTERN void setString(const std::string& name, const std::string& value);
QPID_COMMON_EXTERN void setInt(const std::string& name, const int value);
Modified: qpid/branches/QPID-2519/cpp/include/qpid/framing/FieldValue.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qpid/framing/FieldValue.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qpid/framing/FieldValue.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qpid/framing/FieldValue.h Fri Oct 21 14:42:12 2011
@@ -41,14 +41,14 @@ namespace framing {
*
* \ingroup clientapi
*/
-class FieldValueException : public qpid::Exception {};
+class QPID_COMMON_CLASS_EXTERN FieldValueException : public qpid::Exception {};
/**
* Exception thrown when we can't perform requested conversion
*
* \ingroup clientapi
*/
-struct InvalidConversionException : public FieldValueException {
+struct QPID_COMMON_CLASS_EXTERN InvalidConversionException : public FieldValueException {
InvalidConversionException() {}
};
@@ -59,7 +59,7 @@ class List;
*
* \ingroup clientapi
*/
-class FieldValue {
+class QPID_COMMON_CLASS_EXTERN FieldValue {
public:
/*
* Abstract type for content of different types
@@ -90,7 +90,7 @@ class FieldValue {
void encode(Buffer& buffer);
void decode(Buffer& buffer);
QPID_COMMON_EXTERN bool operator==(const FieldValue&) const;
- QPID_COMMON_EXTERN bool operator!=(const FieldValue& v) const { return !(*this == v); }
+ QPID_COMMON_INLINE_EXTERN bool operator!=(const FieldValue& v) const { return !(*this == v); }
QPID_COMMON_EXTERN void print(std::ostream& out) const;
@@ -98,6 +98,7 @@ class FieldValue {
template <typename T> T get() const { throw InvalidConversionException(); }
template <class T, int W> T getIntegerValue() const;
+ template <class T> T getIntegerValue() const;
template <class T, int W> T getFloatingPointValue() const;
template <int W> void getFixedWidthValue(unsigned char*) const;
template <class T> bool get(T&) const;
@@ -196,6 +197,18 @@ inline T FieldValue::getIntegerValue() c
}
}
+template <class T>
+inline T FieldValue::getIntegerValue() const
+{
+ FixedWidthValue<1>* const fwv = dynamic_cast< FixedWidthValue<1>* const>(data.get());
+ if (fwv) {
+ uint8_t* octets = fwv->rawOctets();
+ return octets[0];
+ } else {
+ throw InvalidConversionException();
+ }
+}
+
template <class T, int W>
inline T FieldValue::getFloatingPointValue() const {
FixedWidthValue<W>* const fwv = dynamic_cast< FixedWidthValue<W>* const>(data.get());
Modified: qpid/branches/QPID-2519/cpp/include/qpid/framing/List.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qpid/framing/List.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qpid/framing/List.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qpid/framing/List.h Fri Oct 21 14:42:12 2011
@@ -36,10 +36,11 @@ class FieldValue;
/**
* Representation of an AMQP 0-10 list
*/
-class List
+class QPID_COMMON_CLASS_EXTERN List
{
public:
typedef boost::shared_ptr<FieldValue> ValuePtr;
+ typedef ValuePtr value_type;
typedef std::list<ValuePtr> Values;
typedef Values::const_iterator const_iterator;
typedef Values::iterator iterator;
@@ -53,19 +54,19 @@ class List
QPID_COMMON_EXTERN bool operator==(const List& other) const;
// std collection interface.
- QPID_COMMON_EXTERN const_iterator begin() const { return values.begin(); }
- QPID_COMMON_EXTERN const_iterator end() const { return values.end(); }
- QPID_COMMON_EXTERN iterator begin() { return values.begin(); }
- QPID_COMMON_EXTERN iterator end(){ return values.end(); }
-
- QPID_COMMON_EXTERN ValuePtr front() const { return values.front(); }
- QPID_COMMON_EXTERN ValuePtr back() const { return values.back(); }
- QPID_COMMON_EXTERN size_t size() const { return values.size(); }
-
- QPID_COMMON_EXTERN iterator insert(iterator i, ValuePtr value) { return values.insert(i, value); }
- QPID_COMMON_EXTERN void erase(iterator i) { values.erase(i); }
- QPID_COMMON_EXTERN void push_back(ValuePtr value) { values.insert(end(), value); }
- QPID_COMMON_EXTERN void pop_back() { values.pop_back(); }
+ QPID_COMMON_INLINE_EXTERN const_iterator begin() const { return values.begin(); }
+ QPID_COMMON_INLINE_EXTERN const_iterator end() const { return values.end(); }
+ QPID_COMMON_INLINE_EXTERN iterator begin() { return values.begin(); }
+ QPID_COMMON_INLINE_EXTERN iterator end(){ return values.end(); }
+
+ QPID_COMMON_INLINE_EXTERN ValuePtr front() const { return values.front(); }
+ QPID_COMMON_INLINE_EXTERN ValuePtr back() const { return values.back(); }
+ QPID_COMMON_INLINE_EXTERN size_t size() const { return values.size(); }
+
+ QPID_COMMON_INLINE_EXTERN iterator insert(iterator i, ValuePtr value) { return values.insert(i, value); }
+ QPID_COMMON_INLINE_EXTERN void erase(iterator i) { values.erase(i); }
+ QPID_COMMON_INLINE_EXTERN void push_back(ValuePtr value) { values.insert(end(), value); }
+ QPID_COMMON_INLINE_EXTERN void pop_back() { values.pop_back(); }
private:
Values values;
Modified: qpid/branches/QPID-2519/cpp/include/qpid/framing/ProtocolVersion.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qpid/framing/ProtocolVersion.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qpid/framing/ProtocolVersion.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qpid/framing/ProtocolVersion.h Fri Oct 21 14:42:12 2011
@@ -29,7 +29,7 @@ namespace qpid
namespace framing
{
-class ProtocolVersion
+class QPID_COMMON_CLASS_EXTERN ProtocolVersion
{
private:
uint8_t major_;
@@ -39,16 +39,16 @@ public:
explicit ProtocolVersion(uint8_t _major=0, uint8_t _minor=0)
: major_(_major), minor_(_minor) {}
- QPID_COMMON_EXTERN uint8_t getMajor() const { return major_; }
- QPID_COMMON_EXTERN void setMajor(uint8_t major) { major_ = major; }
- QPID_COMMON_EXTERN uint8_t getMinor() const { return minor_; }
- QPID_COMMON_EXTERN void setMinor(uint8_t minor) { minor_ = minor; }
+ QPID_COMMON_INLINE_EXTERN uint8_t getMajor() const { return major_; }
+ QPID_COMMON_INLINE_EXTERN void setMajor(uint8_t major) { major_ = major; }
+ QPID_COMMON_INLINE_EXTERN uint8_t getMinor() const { return minor_; }
+ QPID_COMMON_INLINE_EXTERN void setMinor(uint8_t minor) { minor_ = minor; }
QPID_COMMON_EXTERN const std::string toString() const;
QPID_COMMON_EXTERN ProtocolVersion& operator=(ProtocolVersion p);
QPID_COMMON_EXTERN bool operator==(ProtocolVersion p) const;
- QPID_COMMON_EXTERN bool operator!=(ProtocolVersion p) const { return ! (*this == p); }
+ QPID_COMMON_INLINE_EXTERN bool operator!=(ProtocolVersion p) const { return ! (*this == p); }
};
} // namespace framing
Modified: qpid/branches/QPID-2519/cpp/include/qpid/framing/SequenceNumber.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qpid/framing/SequenceNumber.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qpid/framing/SequenceNumber.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qpid/framing/SequenceNumber.h Fri Oct 21 14:42:12 2011
@@ -34,7 +34,7 @@ class Buffer;
/**
* 4-byte sequence number that 'wraps around'.
*/
-class SequenceNumber : public
+class QPID_COMMON_CLASS_EXTERN SequenceNumber : public
boost::equality_comparable<
SequenceNumber, boost::less_than_comparable<
SequenceNumber, boost::incrementable<
Modified: qpid/branches/QPID-2519/cpp/include/qpid/framing/SequenceSet.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qpid/framing/SequenceSet.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qpid/framing/SequenceSet.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qpid/framing/SequenceSet.h Fri Oct 21 14:42:12 2011
@@ -29,7 +29,7 @@ namespace qpid {
namespace framing {
class Buffer;
-class SequenceSet : public RangeSet<SequenceNumber> {
+class QPID_COMMON_CLASS_EXTERN SequenceSet : public RangeSet<SequenceNumber> {
public:
SequenceSet() {}
SequenceSet(const RangeSet<SequenceNumber>& r)
Modified: qpid/branches/QPID-2519/cpp/include/qpid/framing/StructHelper.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qpid/framing/StructHelper.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qpid/framing/StructHelper.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qpid/framing/StructHelper.h Fri Oct 21 14:42:12 2011
@@ -30,7 +30,7 @@
namespace qpid {
namespace framing {
-class StructHelper
+class QPID_COMMON_CLASS_EXTERN StructHelper
{
public:
Modified: qpid/branches/QPID-2519/cpp/include/qpid/framing/Uuid.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qpid/framing/Uuid.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qpid/framing/Uuid.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qpid/framing/Uuid.h Fri Oct 21 14:42:12 2011
@@ -52,22 +52,22 @@ struct Uuid : public boost::array<uint8_
// boost::array gives us ==, < etc.
/** Copy from 16 bytes of data. */
- void assign(const uint8_t* data);
+ QPID_COMMON_EXTERN void assign(const uint8_t* data);
/** Set to a new unique identifier. */
QPID_COMMON_EXTERN void generate();
/** Set to all zeros. */
- void clear();
+ QPID_COMMON_EXTERN void clear();
/** Test for null (all zeros). */
QPID_COMMON_EXTERN bool isNull() const;
- operator bool() const { return !isNull(); }
- bool operator!() const { return isNull(); }
+ QPID_COMMON_INLINE_EXTERN operator bool() const { return !isNull(); }
+ QPID_COMMON_INLINE_EXTERN bool operator!() const { return isNull(); }
QPID_COMMON_EXTERN void encode(framing::Buffer& buf) const;
QPID_COMMON_EXTERN void decode(framing::Buffer& buf);
- QPID_COMMON_EXTERN uint32_t encodedSize() const
+ QPID_COMMON_INLINE_EXTERN uint32_t encodedSize() const
{ return static_cast<uint32_t>(size()); }
/** String value in format 1b4e28ba-2fa1-11d2-883f-b9a761bde3fb. */
Modified: qpid/branches/QPID-2519/cpp/include/qpid/log/Logger.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qpid/log/Logger.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qpid/log/Logger.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qpid/log/Logger.h Fri Oct 21 14:42:12 2011
@@ -33,10 +33,10 @@ namespace log {
* is handled by Logger::Output-derived classes instantiated by the
* platform's sink-related options.
*/
-class Logger : private boost::noncopyable {
+class QPID_COMMON_CLASS_EXTERN Logger : private boost::noncopyable {
public:
/** Flags indicating what to include in the log output */
- enum FormatFlag { FILE=1, LINE=2, FUNCTION=4, LEVEL=8, TIME=16, THREAD=32};
+ enum FormatFlag { FILE=1, LINE=2, FUNCTION=4, LEVEL=8, TIME=16, THREAD=32, HIRES=64};
/**
* Logging output sink.
@@ -93,7 +93,7 @@ class Logger : private boost::noncopyabl
QPID_COMMON_EXTERN void clear();
/** Get the options used to configure the logger. */
- QPID_COMMON_EXTERN const Options& getOptions() const { return options; }
+ QPID_COMMON_INLINE_EXTERN const Options& getOptions() const { return options; }
private:
Modified: qpid/branches/QPID-2519/cpp/include/qpid/log/Options.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qpid/log/Options.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qpid/log/Options.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qpid/log/Options.h Fri Oct 21 14:42:12 2011
@@ -39,7 +39,7 @@ struct Options : public qpid::Options {
std::string argv0;
std::string name;
std::vector<std::string> selectors;
- bool time, level, thread, source, function;
+ bool time, level, thread, source, function, hiresTs;
bool trace;
std::string prefix;
std::auto_ptr<SinkOptions> sinkOptions;
Modified: qpid/branches/QPID-2519/cpp/include/qpid/management/ManagementObject.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qpid/management/ManagementObject.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qpid/management/ManagementObject.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qpid/management/ManagementObject.h Fri Oct 21 14:42:12 2011
@@ -58,14 +58,14 @@ protected:
std::string agentName;
void fromString(const std::string&);
public:
- QPID_COMMON_EXTERN ObjectId() : agent(0), first(0), second(0), agentEpoch(0) {}
- QPID_COMMON_EXTERN ObjectId(const types::Variant& map) :
+ QPID_COMMON_INLINE_EXTERN ObjectId() : agent(0), first(0), second(0), agentEpoch(0) {}
+ QPID_COMMON_INLINE_EXTERN ObjectId(const types::Variant& map) :
agent(0), first(0), second(0), agentEpoch(0) { mapDecode(map.asMap()); }
QPID_COMMON_EXTERN ObjectId(uint8_t flags, uint16_t seq, uint32_t broker);
QPID_COMMON_EXTERN ObjectId(AgentAttachment* _agent, uint8_t flags, uint16_t seq);
QPID_COMMON_EXTERN ObjectId(std::istream&);
QPID_COMMON_EXTERN ObjectId(const std::string&);
- QPID_COMMON_EXTERN ObjectId(const std::string& agentAddress, const std::string& key,
+ QPID_COMMON_INLINE_EXTERN ObjectId(const std::string& agentAddress, const std::string& key,
uint64_t epoch=0) : agent(0), first(0), second(0),
agentEpoch(epoch), v2Key(key), agentName(agentAddress) {}
@@ -76,15 +76,15 @@ public:
QPID_COMMON_EXTERN void mapEncode(types::Variant::Map& map) const;
QPID_COMMON_EXTERN void mapDecode(const types::Variant::Map& map);
QPID_COMMON_EXTERN operator types::Variant::Map() const;
- QPID_COMMON_EXTERN uint32_t encodedSize() const { return 16; };
+ QPID_COMMON_INLINE_EXTERN uint32_t encodedSize() const { return 16; };
QPID_COMMON_EXTERN void encode(std::string& buffer) const;
QPID_COMMON_EXTERN void decode(const std::string& buffer);
QPID_COMMON_EXTERN bool equalV1(const ObjectId &other) const;
- QPID_COMMON_EXTERN void setV2Key(const std::string& _key) { v2Key = _key; }
+ QPID_COMMON_INLINE_EXTERN void setV2Key(const std::string& _key) { v2Key = _key; }
QPID_COMMON_EXTERN void setV2Key(const ManagementObject& object);
- QPID_COMMON_EXTERN void setAgentName(const std::string& _name) { agentName = _name; }
- QPID_COMMON_EXTERN const std::string& getAgentName() const { return agentName; }
- QPID_COMMON_EXTERN const std::string& getV2Key() const { return v2Key; }
+ QPID_COMMON_INLINE_EXTERN void setAgentName(const std::string& _name) { agentName = _name; }
+ QPID_COMMON_INLINE_EXTERN const std::string& getAgentName() const { return agentName; }
+ QPID_COMMON_INLINE_EXTERN const std::string& getV2Key() const { return v2Key; }
friend QPID_COMMON_EXTERN std::ostream& operator<<(std::ostream&, const ObjectId&);
};
@@ -131,7 +131,7 @@ public:
virtual ~ManagementItem() {}
};
-class ManagementObject : public ManagementItem
+class QPID_COMMON_CLASS_EXTERN ManagementObject : public ManagementItem
{
protected:
Modified: qpid/branches/QPID-2519/cpp/include/qpid/messaging/Address.h
URL: http://svn.apache.org/viewvc/qpid/branches/QPID-2519/cpp/include/qpid/messaging/Address.h?rev=1187375&r1=1187374&r2=1187375&view=diff
==============================================================================
--- qpid/branches/QPID-2519/cpp/include/qpid/messaging/Address.h (original)
+++ qpid/branches/QPID-2519/cpp/include/qpid/messaging/Address.h Fri Oct 21 14:42:12 2011
@@ -119,7 +119,7 @@ class AddressImpl;
*
* An address has value semantics.
*/
-class Address
+class QPID_MESSAGING_CLASS_EXTERN Address
{
public:
QPID_MESSAGING_EXTERN Address();
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org