Author: chug
Date: Wed Aug 28 19:34:59 2013
New Revision: 1518337
URL: http://svn.apache.org/r1518337
Log:
QPID-5102: C++ Broker Windows build with PROTON needs new _EXTERN statements.
Note that this patch supplies only _EXTERNs. It does not change the build for
finding PROTON nor does it correct the QPID-5100 amqp/amqpc library export
issues.
Modified:
qpid/trunk/qpid/cpp/src/qpid/Address.h
qpid/trunk/qpid/cpp/src/qpid/NullSaslServer.h
qpid/trunk/qpid/cpp/src/qpid/Sasl.h
qpid/trunk/qpid/cpp/src/qpid/SaslFactory.h
qpid/trunk/qpid/cpp/src/qpid/SaslServer.h
qpid/trunk/qpid/cpp/src/qpid/amqp/Descriptor.h
qpid/trunk/qpid/cpp/src/qpid/amqp/Encoder.h
qpid/trunk/qpid/cpp/src/qpid/amqp/MapReader.h
qpid/trunk/qpid/cpp/src/qpid/amqp/MessageEncoder.h
qpid/trunk/qpid/cpp/src/qpid/amqp/Sasl.h
qpid/trunk/qpid/cpp/src/qpid/amqp/SaslClient.h
qpid/trunk/qpid/cpp/src/qpid/amqp/SaslServer.h
qpid/trunk/qpid/cpp/src/qpid/broker/DirectExchange.h
qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.h
qpid/trunk/qpid/cpp/src/qpid/broker/IngressCompletion.h
qpid/trunk/qpid/cpp/src/qpid/broker/Message.h
qpid/trunk/qpid/cpp/src/qpid/broker/ObjectFactory.h
qpid/trunk/qpid/cpp/src/qpid/broker/PersistableMessage.h
qpid/trunk/qpid/cpp/src/qpid/broker/PersistableObject.h
qpid/trunk/qpid/cpp/src/qpid/broker/Protocol.h
qpid/trunk/qpid/cpp/src/qpid/broker/RecoverableMessageImpl.h
qpid/trunk/qpid/cpp/src/qpid/broker/Selector.h
qpid/trunk/qpid/cpp/src/qpid/broker/TopicExchange.h
qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/Transport.h
Modified: qpid/trunk/qpid/cpp/src/qpid/Address.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/Address.h?rev=1518337&r1=1518336&r2=1518337&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/Address.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/Address.h Wed Aug 28 19:34:59 2013
@@ -33,8 +33,8 @@ namespace client { struct ConnectionSett
*/
struct Address {
public:
- static const std::string TCP; // Default TCP protocol tag.
- static const uint16_t AMQP_PORT=5672; // Default AMQP port.
+ QPID_COMMON_EXTERN static const std::string TCP; // Default TCP protocol
tag.
+ QPID_COMMON_EXTERN static const uint16_t AMQP_PORT=5672; // Default AMQP
port.
QPID_COMMON_INLINE_EXTERN explicit Address(
const std::string& protocol_=std::string(),
Modified: qpid/trunk/qpid/cpp/src/qpid/NullSaslServer.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/NullSaslServer.h?rev=1518337&r1=1518336&r2=1518337&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/NullSaslServer.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/NullSaslServer.h Wed Aug 28 19:34:59 2013
@@ -21,6 +21,7 @@
* under the License.
*
*/
+#include "qpid/CommonImportExport.h"
#include "qpid/SaslServer.h"
namespace qpid {
@@ -34,7 +35,7 @@ namespace qpid {
class NullSaslServer : public SaslServer
{
public:
- NullSaslServer(const std::string& realm);
+ QPID_COMMON_EXTERN NullSaslServer(const std::string& realm);
Status start(const std::string& mechanism, const std::string* response,
std::string& challenge);
Status step(const std::string* response, std::string& challenge);
std::string getMechanisms();
Modified: qpid/trunk/qpid/cpp/src/qpid/Sasl.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/Sasl.h?rev=1518337&r1=1518336&r2=1518337&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/Sasl.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/Sasl.h Wed Aug 28 19:34:59 2013
@@ -24,6 +24,7 @@
#include <memory>
#include <string>
+#include "qpid/CommonImportExport.h"
#include "qpid/sys/IntegerTypes.h"
namespace qpid {
@@ -53,7 +54,7 @@ class Sasl
virtual std::string getMechanism() = 0;
virtual std::string getUserId() = 0;
virtual std::auto_ptr<qpid::sys::SecurityLayer> getSecurityLayer(uint16_t
maxFrameSize) = 0;
- virtual ~Sasl() {}
+ QPID_COMMON_EXTERN virtual ~Sasl() {}
};
} // namespace qpid
Modified: qpid/trunk/qpid/cpp/src/qpid/SaslFactory.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/SaslFactory.h?rev=1518337&r1=1518336&r2=1518337&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/SaslFactory.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/SaslFactory.h Wed Aug 28 19:34:59 2013
@@ -21,6 +21,7 @@
* under the License.
*
*/
+#include "qpid/CommonImportExport.h"
#include "qpid/Sasl.h"
#include "qpid/sys/Mutex.h"
#include <memory>
Modified: qpid/trunk/qpid/cpp/src/qpid/SaslServer.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/SaslServer.h?rev=1518337&r1=1518336&r2=1518337&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/SaslServer.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/SaslServer.h Wed Aug 28 19:34:59 2013
@@ -35,7 +35,7 @@ class SaslServer
{
public:
typedef enum {OK, FAIL, CHALLENGE} Status;
- virtual ~SaslServer() {}
+ QPID_COMMON_EXTERN virtual ~SaslServer() {}
virtual Status start(const std::string& mechanism, const std::string*
response, std::string& challenge) = 0;
virtual Status step(const std::string* response, std::string& challenge) =
0;
virtual std::string getMechanisms() = 0;
Modified: qpid/trunk/qpid/cpp/src/qpid/amqp/Descriptor.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/amqp/Descriptor.h?rev=1518337&r1=1518336&r2=1518337&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/amqp/Descriptor.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/amqp/Descriptor.h Wed Aug 28 19:34:59 2013
@@ -42,13 +42,13 @@ struct Descriptor
SYMBOLIC
} type;
- Descriptor(uint64_t code);
- Descriptor(const CharSequence& symbol);
- bool match(const std::string&, uint64_t) const;
- size_t getSize() const;
+ QPID_COMMON_EXTERN Descriptor(uint64_t code);
+ QPID_COMMON_EXTERN Descriptor(const CharSequence& symbol);
+ QPID_COMMON_EXTERN bool match(const std::string&, uint64_t) const;
+ QPID_COMMON_EXTERN size_t getSize() const;
};
-std::ostream& operator<<(std::ostream& os, const Descriptor& d);
+QPID_COMMON_EXTERN std::ostream& operator<<(std::ostream& os, const
Descriptor& d);
}} // namespace qpid::amqp
Modified: qpid/trunk/qpid/cpp/src/qpid/amqp/Encoder.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/amqp/Encoder.h?rev=1518337&r1=1518336&r2=1518337&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/amqp/Encoder.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/amqp/Encoder.h Wed Aug 28 19:34:59 2013
@@ -77,7 +77,7 @@ class Encoder
void writeString(const CharSequence&, const Descriptor* d=0);
void writeString(const std::string&, const Descriptor* d=0);
void writeBinary(const CharSequence&, const Descriptor* d=0);
- void writeBinary(const std::string&, const Descriptor* d=0);
+ QPID_COMMON_EXTERN void writeBinary(const std::string&, const Descriptor*
d=0);
void* startList8(const Descriptor* d=0);
void* startList32(const Descriptor* d=0);
@@ -94,13 +94,13 @@ class Encoder
void endArray8(size_t count, void*);
void endArray32(size_t count, void*);
- void writeValue(const qpid::types::Variant&, const Descriptor* d=0);
- void writeMap(const std::map<std::string, qpid::types::Variant>& value,
const Descriptor* d=0, bool large=true);
- void writeList(const std::list<qpid::types::Variant>& value, const
Descriptor* d=0, bool large=true);
+ QPID_COMMON_EXTERN void writeValue(const qpid::types::Variant&, const
Descriptor* d=0);
+ QPID_COMMON_EXTERN void writeMap(const std::map<std::string,
qpid::types::Variant>& value, const Descriptor* d=0, bool large=true);
+ QPID_COMMON_EXTERN void writeList(const std::list<qpid::types::Variant>&
value, const Descriptor* d=0, bool large=true);
void writeDescriptor(const Descriptor&);
Encoder(char* data, size_t size);
- size_t getPosition();
+ QPID_COMMON_EXTERN size_t getPosition();
void resetPosition(size_t p);
char* skip(size_t);
void writeBytes(const char* bytes, size_t count);
Modified: qpid/trunk/qpid/cpp/src/qpid/amqp/MapReader.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/amqp/MapReader.h?rev=1518337&r1=1518336&r2=1518337&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/amqp/MapReader.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/amqp/MapReader.h Wed Aug 28 19:34:59 2013
@@ -68,36 +68,36 @@ class MapReader : public Reader
//this class implements the Reader interface, thus acting as a transformer
into a more map oriented scheme
- void onNull(const Descriptor*);
- void onBoolean(bool, const Descriptor*);
- void onUByte(uint8_t, const Descriptor*);
- void onUShort(uint16_t, const Descriptor*);
- void onUInt(uint32_t, const Descriptor*);
- void onULong(uint64_t, const Descriptor*);
- void onByte(int8_t, const Descriptor*);
- void onShort(int16_t, const Descriptor*);
- void onInt(int32_t, const Descriptor*);
- void onLong(int64_t, const Descriptor*);
- void onFloat(float, const Descriptor*);
- void onDouble(double, const Descriptor*);
- void onUuid(const CharSequence&, const Descriptor*);
- void onTimestamp(int64_t, const Descriptor*);
-
- void onBinary(const CharSequence&, const Descriptor*);
- void onString(const CharSequence&, const Descriptor*);
- void onSymbol(const CharSequence&, const Descriptor*);
-
- bool onStartList(uint32_t /*count*/, const CharSequence&, const
Descriptor*);
- bool onStartMap(uint32_t /*count*/, const CharSequence&, const
Descriptor*);
- bool onStartArray(uint32_t /*count*/, const CharSequence&, const
Constructor&, const Descriptor*);
- void onEndList(uint32_t /*count*/, const Descriptor*);
- void onEndMap(uint32_t /*count*/, const Descriptor*);
- void onEndArray(uint32_t /*count*/, const Descriptor*);
-
- MapReader();
- static const int SYMBOL_KEY;
- static const int STRING_KEY;
- void setAllowedKeyType(int);
+ QPID_COMMON_EXTERN void onNull(const Descriptor*);
+ QPID_COMMON_EXTERN void onBoolean(bool, const Descriptor*);
+ QPID_COMMON_EXTERN void onUByte(uint8_t, const Descriptor*);
+ QPID_COMMON_EXTERN void onUShort(uint16_t, const Descriptor*);
+ QPID_COMMON_EXTERN void onUInt(uint32_t, const Descriptor*);
+ QPID_COMMON_EXTERN void onULong(uint64_t, const Descriptor*);
+ QPID_COMMON_EXTERN void onByte(int8_t, const Descriptor*);
+ QPID_COMMON_EXTERN void onShort(int16_t, const Descriptor*);
+ QPID_COMMON_EXTERN void onInt(int32_t, const Descriptor*);
+ QPID_COMMON_EXTERN void onLong(int64_t, const Descriptor*);
+ QPID_COMMON_EXTERN void onFloat(float, const Descriptor*);
+ QPID_COMMON_EXTERN void onDouble(double, const Descriptor*);
+ QPID_COMMON_EXTERN void onUuid(const CharSequence&, const Descriptor*);
+ QPID_COMMON_EXTERN void onTimestamp(int64_t, const Descriptor*);
+
+ QPID_COMMON_EXTERN void onBinary(const CharSequence&, const Descriptor*);
+ QPID_COMMON_EXTERN void onString(const CharSequence&, const Descriptor*);
+ QPID_COMMON_EXTERN void onSymbol(const CharSequence&, const Descriptor*);
+
+ QPID_COMMON_EXTERN bool onStartList(uint32_t /*count*/, const
CharSequence&, const Descriptor*);
+ QPID_COMMON_EXTERN bool onStartMap(uint32_t /*count*/, const
CharSequence&, const Descriptor*);
+ QPID_COMMON_EXTERN bool onStartArray(uint32_t /*count*/, const
CharSequence&, const Constructor&, const Descriptor*);
+ QPID_COMMON_EXTERN void onEndList(uint32_t /*count*/, const Descriptor*);
+ QPID_COMMON_EXTERN void onEndMap(uint32_t /*count*/, const Descriptor*);
+ QPID_COMMON_EXTERN void onEndArray(uint32_t /*count*/, const Descriptor*);
+
+ QPID_COMMON_EXTERN MapReader();
+ QPID_COMMON_EXTERN static const int SYMBOL_KEY;
+ QPID_COMMON_EXTERN static const int STRING_KEY;
+ QPID_COMMON_EXTERN void setAllowedKeyType(int);
private:
CharSequence key;
size_t level;
Modified: qpid/trunk/qpid/cpp/src/qpid/amqp/MessageEncoder.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/amqp/MessageEncoder.h?rev=1518337&r1=1518336&r2=1518337&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/amqp/MessageEncoder.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/amqp/MessageEncoder.h Wed Aug 28 19:34:59 2013
@@ -39,7 +39,7 @@ class MessageEncoder : public Encoder
virtual ~Header() {}
virtual bool isDurable() const = 0;
virtual uint8_t getPriority() const = 0;
- virtual bool hasTtl() const = 0;
+ QPID_COMMON_EXTERN virtual bool hasTtl() const = 0;
virtual uint32_t getTtl() const = 0;
virtual bool isFirstAcquirer() const = 0;
virtual uint32_t getDeliveryCount() const = 0;
@@ -84,25 +84,25 @@ class MessageEncoder : public Encoder
virtual void handle(MapHandler&) const = 0;
};
- MessageEncoder(char* d, size_t s) : Encoder(d, s), optimise(true) {}
- void writeHeader(const Header&);
- void writeProperties(const Properties&);
- void writeApplicationProperties(const ApplicationProperties&);
- void writeApplicationProperties(const qpid::types::Variant::Map&
properties);
- void writeApplicationProperties(const qpid::types::Variant::Map&
properties, bool useLargeMap);
-
- static size_t getEncodedSize(const Header&);
- static size_t getEncodedSize(const Properties&);
- static size_t getEncodedSize(const ApplicationProperties&);
+ QPID_COMMON_EXTERN MessageEncoder(char* d, size_t s) : Encoder(d, s),
optimise(true) {}
+ QPID_COMMON_EXTERN void writeHeader(const Header&);
+ QPID_COMMON_EXTERN void writeProperties(const Properties&);
+ QPID_COMMON_EXTERN void writeApplicationProperties(const
ApplicationProperties&);
+ QPID_COMMON_EXTERN void writeApplicationProperties(const
qpid::types::Variant::Map& properties);
+ QPID_COMMON_EXTERN void writeApplicationProperties(const
qpid::types::Variant::Map& properties, bool useLargeMap);
+
+ QPID_COMMON_EXTERN static size_t getEncodedSize(const Header&);
+ QPID_COMMON_EXTERN static size_t getEncodedSize(const Properties&);
+ QPID_COMMON_EXTERN static size_t getEncodedSize(const
ApplicationProperties&);
- static size_t getEncodedSize(const qpid::types::Variant::List&, bool
useLargeList);
- static size_t getEncodedSize(const qpid::types::Variant::Map&, bool
useLargeMap);
+ QPID_COMMON_EXTERN static size_t getEncodedSize(const
qpid::types::Variant::List&, bool useLargeList);
+ QPID_COMMON_EXTERN static size_t getEncodedSize(const
qpid::types::Variant::Map&, bool useLargeMap);
- static size_t getEncodedSizeForValue(const qpid::types::Variant& value);
- static size_t getEncodedSizeForContent(const std::string&);
+ QPID_COMMON_EXTERN static size_t getEncodedSizeForValue(const
qpid::types::Variant& value);
+ QPID_COMMON_EXTERN static size_t getEncodedSizeForContent(const
std::string&);
//used in translating 0-10 content to 1.0, to determine buffer space needed
- static size_t getEncodedSize(const Properties&, const
qpid::types::Variant::Map&, const std::string&);
+ QPID_COMMON_EXTERN static size_t getEncodedSize(const Properties&, const
qpid::types::Variant::Map&, const std::string&);
private:
bool optimise;
Modified: qpid/trunk/qpid/cpp/src/qpid/amqp/Sasl.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/amqp/Sasl.h?rev=1518337&r1=1518336&r2=1518337&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/amqp/Sasl.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/amqp/Sasl.h Wed Aug 28 19:34:59 2013
@@ -35,12 +35,12 @@ namespace amqp {
class Sasl : protected Reader
{
public:
- Sasl(const std::string& id);
- virtual ~Sasl();
- std::size_t read(const char* data, size_t available);
- std::size_t write(char* data, size_t available);
- std::size_t readProtocolHeader(const char* buffer, std::size_t size);
- std::size_t writeProtocolHeader(char* buffer, std::size_t size);
+ QPID_COMMON_EXTERN Sasl(const std::string& id);
+ QPID_COMMON_EXTERN virtual ~Sasl();
+ QPID_COMMON_EXTERN std::size_t read(const char* data, size_t available);
+ QPID_COMMON_EXTERN std::size_t write(char* data, size_t available);
+ QPID_COMMON_EXTERN std::size_t readProtocolHeader(const char* buffer,
std::size_t size);
+ QPID_COMMON_EXTERN std::size_t writeProtocolHeader(char* buffer,
std::size_t size);
protected:
const std::string id;
std::vector<char> buffer;
Modified: qpid/trunk/qpid/cpp/src/qpid/amqp/SaslClient.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/amqp/SaslClient.h?rev=1518337&r1=1518336&r2=1518337&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/amqp/SaslClient.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/amqp/SaslClient.h Wed Aug 28 19:34:59 2013
@@ -21,6 +21,7 @@
* under the License.
*
*/
+#include <qpid/CommonImportExport.h>
#include "qpid/amqp/Sasl.h"
namespace qpid {
@@ -33,19 +34,19 @@ namespace amqp {
class SaslClient : public Sasl
{
public:
- SaslClient(const std::string& id);
- virtual ~SaslClient();
- virtual void mechanisms(const std::string&) = 0;
- virtual void challenge(const std::string&) = 0;
- virtual void challenge() = 0; //null != empty string
- virtual void outcome(uint8_t result, const std::string&) = 0;
- virtual void outcome(uint8_t result) = 0;
+ QPID_COMMON_EXTERN SaslClient(const std::string& id);
+ QPID_COMMON_EXTERN virtual ~SaslClient();
+ QPID_COMMON_EXTERN virtual void mechanisms(const std::string&) = 0;
+ QPID_COMMON_EXTERN virtual void challenge(const std::string&) = 0;
+ QPID_COMMON_EXTERN virtual void challenge() = 0; //null != empty string
+ QPID_COMMON_EXTERN virtual void outcome(uint8_t result, const
std::string&) = 0;
+ QPID_COMMON_EXTERN virtual void outcome(uint8_t result) = 0;
- void init(const std::string& mechanism, const std::string* response, const
std::string* hostname);
- void response(const std::string*);
+ QPID_COMMON_EXTERN void init(const std::string& mechanism, const
std::string* response, const std::string* hostname);
+ QPID_COMMON_EXTERN void response(const std::string*);
private:
- bool onStartList(uint32_t count, const CharSequence& arguments, const
Descriptor* descriptor);
+ QPID_COMMON_EXTERN bool onStartList(uint32_t count, const CharSequence&
arguments, const Descriptor* descriptor);
};
Modified: qpid/trunk/qpid/cpp/src/qpid/amqp/SaslServer.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/amqp/SaslServer.h?rev=1518337&r1=1518336&r2=1518337&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/amqp/SaslServer.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/amqp/SaslServer.h Wed Aug 28 19:34:59 2013
@@ -33,17 +33,17 @@ namespace amqp {
class SaslServer : public Sasl
{
public:
- SaslServer(const std::string& id);
- virtual ~SaslServer();
+ QPID_COMMON_EXTERN SaslServer(const std::string& id);
+ QPID_COMMON_EXTERN virtual ~SaslServer();
virtual void init(const std::string& mechanism, const std::string*
response, const std::string* hostname) = 0;
virtual void response(const std::string*) = 0;
- void mechanisms(const std::string& mechanisms);
- void challenge(const std::string*);
- void completed(bool succeeded);
+ QPID_COMMON_EXTERN void mechanisms(const std::string& mechanisms);
+ QPID_COMMON_EXTERN void challenge(const std::string*);
+ QPID_COMMON_EXTERN void completed(bool succeeded);
private:
- bool onStartList(uint32_t count, const CharSequence& arguments, const
Descriptor* descriptor);
+ QPID_COMMON_EXTERN bool onStartList(uint32_t count, const CharSequence&
arguments, const Descriptor* descriptor);
};
}} // namespace qpid::amqp
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/DirectExchange.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/DirectExchange.h?rev=1518337&r1=1518336&r2=1518337&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/DirectExchange.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/DirectExchange.h Wed Aug 28 19:34:59
2013
@@ -42,7 +42,7 @@ class DirectExchange : public virtual Ex
qpid::sys::Mutex lock;
public:
- static const std::string typeName;
+ QPID_BROKER_EXTERN static const std::string typeName;
QPID_BROKER_EXTERN DirectExchange(const std::string& name,
management::Manageable* parent = 0,
Broker* broker = 0);
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.h?rev=1518337&r1=1518336&r2=1518337&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/HeadersExchange.h Wed Aug 28 19:34:59
2013
@@ -79,7 +79,7 @@ class HeadersExchange : public virtual E
framing::FieldTable& nonFedArgs);
public:
- static const std::string typeName;
+ QPID_BROKER_EXTERN static const std::string typeName;
QPID_BROKER_EXTERN HeadersExchange(const std::string& name,
management::Manageable* parent = 0,
Broker* broker = 0);
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/IngressCompletion.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/IngressCompletion.h?rev=1518337&r1=1518336&r2=1518337&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/IngressCompletion.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/IngressCompletion.h Wed Aug 28 19:34:59
2013
@@ -38,7 +38,7 @@ class Queue;
class IngressCompletion : public AsyncCompletion
{
public:
- virtual ~IngressCompletion();
+ QPID_BROKER_EXTERN virtual ~IngressCompletion();
void enqueueAsync(boost::shared_ptr<Queue>);
void flush();
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Message.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Message.h?rev=1518337&r1=1518336&r2=1518337&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Message.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Message.h Wed Aug 28 19:34:59 2013
@@ -104,7 +104,7 @@ public:
sys::AbsTime getExpiration() const { return expiration; }
void setExpiration(sys::AbsTime exp) { expiration = exp; }
uint64_t getTtl() const;
- bool getTtl(uint64_t) const;
+ QPID_BROKER_EXTERN bool getTtl(uint64_t) const;
/** set the timestamp delivery property to the current time-of-day */
QPID_BROKER_EXTERN void setTimestamp();
@@ -136,7 +136,7 @@ public:
QPID_BROKER_EXTERN qpid::types::Variant getAnnotation(const std::string&
key) const;
QPID_BROKER_EXTERN const qpid::types::Variant::Map& getAnnotations() const;
- std::string getUserId() const;
+ QPID_BROKER_EXTERN std::string getUserId() const;
QPID_BROKER_EXTERN std::string getContent() const;//Used for ha,
management, when content needs to be decoded
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/ObjectFactory.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/ObjectFactory.h?rev=1518337&r1=1518336&r2=1518337&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/ObjectFactory.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/ObjectFactory.h Wed Aug 28 19:34:59 2013
@@ -21,6 +21,7 @@
* under the License.
*
*/
+#include "qpid/broker/BrokerImportExport.h"
#include "qpid/types/Variant.h"
#include <vector>
@@ -56,7 +57,7 @@ class ObjectFactoryRegistry : public Obj
bool recoverObject(Broker&, const std::string& type, const std::string&
name, const qpid::types::Variant::Map& properties, uint64_t persistenceId);
~ObjectFactoryRegistry();
- void add(ObjectFactory*);
+ QPID_BROKER_EXTERN void add(ObjectFactory*);
private:
typedef std::vector<ObjectFactory*> Factories;
Factories factories;
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/PersistableMessage.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/PersistableMessage.h?rev=1518337&r1=1518336&r2=1518337&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/PersistableMessage.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/PersistableMessage.h Wed Aug 28
19:34:59 2013
@@ -62,8 +62,8 @@ class PersistableMessage : public Persis
mutable uint64_t persistenceId;
public:
- virtual ~PersistableMessage();
- PersistableMessage();
+ QPID_BROKER_EXTERN virtual ~PersistableMessage();
+ QPID_BROKER_EXTERN PersistableMessage();
virtual QPID_BROKER_EXTERN bool isPersistent() const = 0;
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/PersistableObject.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/PersistableObject.h?rev=1518337&r1=1518336&r2=1518337&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/PersistableObject.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/PersistableObject.h Wed Aug 28 19:34:59
2013
@@ -21,6 +21,7 @@
* under the License.
*
*/
+#include "qpid/broker/BrokerImportExport.h"
#include "PersistableConfig.h"
#include "qpid/types/Variant.h"
#include <vector>
@@ -37,13 +38,13 @@ class RecoverableConfig;
class PersistableObject : public PersistableConfig
{
public:
- PersistableObject(const std::string& name, const std::string& type, const
qpid::types::Variant::Map properties);
- virtual ~PersistableObject();
- const std::string& getName() const;
- void setPersistenceId(uint64_t id) const;
- uint64_t getPersistenceId() const;
- void encode(framing::Buffer& buffer) const;
- uint32_t encodedSize() const;
+ QPID_BROKER_EXTERN PersistableObject(const std::string& name, const
std::string& type, const qpid::types::Variant::Map properties);
+ QPID_BROKER_EXTERN virtual ~PersistableObject();
+ QPID_BROKER_EXTERN const std::string& getName() const;
+ QPID_BROKER_EXTERN void setPersistenceId(uint64_t id) const;
+ QPID_BROKER_EXTERN uint64_t getPersistenceId() const;
+ QPID_BROKER_EXTERN void encode(framing::Buffer& buffer) const;
+ QPID_BROKER_EXTERN uint32_t encodedSize() const;
friend class RecoveredObjects;
private:
std::string name;
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Protocol.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Protocol.h?rev=1518337&r1=1518336&r2=1518337&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Protocol.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Protocol.h Wed Aug 28 19:34:59 2013
@@ -72,7 +72,7 @@ class ProtocolRegistry : public Protocol
QPID_BROKER_EXTERN Message decode(qpid::framing::Buffer&);
QPID_BROKER_EXTERN ~ProtocolRegistry();
- void add(const std::string&, Protocol*);
+ QPID_BROKER_EXTERN void add(const std::string&, Protocol*);
private:
//name may be useful for descriptive purposes or even for some
//limited manipulation of ordering
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/RecoverableMessageImpl.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/RecoverableMessageImpl.h?rev=1518337&r1=1518336&r2=1518337&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/RecoverableMessageImpl.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/RecoverableMessageImpl.h Wed Aug 28
19:34:59 2013
@@ -33,7 +33,7 @@ class RecoverableMessageImpl : public Re
{
Message msg;
public:
- RecoverableMessageImpl(const Message& _msg);
+ QPID_BROKER_EXTERN RecoverableMessageImpl(const Message& _msg);
~RecoverableMessageImpl() {};
void setPersistenceId(uint64_t id);
void setRedelivered();
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Selector.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Selector.h?rev=1518337&r1=1518336&r2=1518337&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Selector.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Selector.h Wed Aug 28 19:34:59 2013
@@ -64,7 +64,7 @@ public:
* @param msg message to filter against selector
* @return true if msg meets the selector specification
*/
- bool filter(const Message& msg);
+ QPID_BROKER_EXTERN bool filter(const Message& msg);
};
/**
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/TopicExchange.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/TopicExchange.h?rev=1518337&r1=1518336&r2=1518337&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/TopicExchange.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/TopicExchange.h Wed Aug 28 19:34:59 2013
@@ -81,7 +81,7 @@ class TopicExchange : public virtual Exc
};
public:
- static const std::string typeName;
+ QPID_BROKER_EXTERN static const std::string typeName;
static QPID_BROKER_EXTERN std::string normalize(const std::string&
pattern);
Modified: qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/Transport.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/Transport.h?rev=1518337&r1=1518336&r2=1518337&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/Transport.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/messaging/amqp/Transport.h Wed Aug 28 19:34:59
2013
@@ -21,6 +21,7 @@
* under the License.
*
*/
+#include "qpid/CommonImportExport.h"
#include "qpid/sys/OutputControl.h"
#include <boost/shared_ptr.hpp>
@@ -42,8 +43,8 @@ class Transport : public qpid::sys::Outp
virtual const qpid::sys::SecuritySettings* getSecuritySettings() = 0;
typedef Transport* Factory(TransportContext&,
boost::shared_ptr<qpid::sys::Poller>);
- static Transport* create(const std::string& name, TransportContext&,
boost::shared_ptr<qpid::sys::Poller>);
- static void add(const std::string& name, Factory* factory);
+ QPID_COMMON_EXTERN static Transport* create(const std::string& name,
TransportContext&, boost::shared_ptr<qpid::sys::Poller>);
+ QPID_COMMON_EXTERN static void add(const std::string& name, Factory*
factory);
};
}}} // namespace qpid::messaging::amqp
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
