From ccb7d734a368b5fa2135440edeefdb6f3ac563ac Mon Sep 17 00:00:00 2001 From: "Stephen D. Huston" Date: Tue, 3 Mar 2009 16:02:13 +0000 Subject: Add needed exports to build with tests git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/qpid-1673@749637 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/src/qmfconsole.vcproj | 232 ++++++++++++------- qpid/cpp/src/qpid/SessionId.h | 2 +- qpid/cpp/src/qpid/SessionState.h | 2 +- qpid/cpp/src/qpid/client/Future.h | 7 +- qpid/cpp/src/qpid/client/FutureResult.h | 4 +- qpid/cpp/src/qpid/client/LocalQueue.h | 15 +- qpid/cpp/src/qpid/client/QueueOptions.h | 46 ++-- qpid/cpp/src/qpid/client/Subscription.h | 2 +- qpid/cpp/src/qpid/console/Agent.h | 5 +- qpid/cpp/src/qpid/console/Broker.h | 7 +- qpid/cpp/src/qpid/console/ClassKey.h | 5 +- qpid/cpp/src/qpid/console/ConsoleImportExport.h | 33 +++ qpid/cpp/src/qpid/console/ConsoleListener.h | 3 +- qpid/cpp/src/qpid/console/Event.h | 3 +- qpid/cpp/src/qpid/console/Object.h | 29 +-- qpid/cpp/src/qpid/console/ObjectId.h | 5 +- qpid/cpp/src/qpid/console/Package.h | 1 + qpid/cpp/src/qpid/console/SequenceManager.h | 5 +- qpid/cpp/src/qpid/framing/AccumulatedAck.h | 12 +- qpid/cpp/src/qpid/framing/Array.h | 4 +- qpid/cpp/src/qpid/framing/FieldValue.h | 18 +- qpid/cpp/src/qpid/framing/SequenceNumberSet.h | 4 +- qpid/cpp/src/qpid/framing/SequenceSet.h | 2 +- qpid/cpp/src/qpid/log/Logger.h | 4 +- qpid/cpp/src/qpid/log/OstreamOutput.h | 4 +- qpid/cpp/src/qpid/log/Selector.h | 7 +- qpid/cpp/src/qpid/log/windows/SinkOptions.h | 8 +- qpid/cpp/src/qpid/management/Manageable.h | 6 +- qpid/cpp/src/qpid/management/ManagementObject.h | 4 +- qpid/cpp/src/qpid/sys/Shlib.h | 11 +- qpid/cpp/src/qpid/sys/Socket.h | 6 +- qpid/cpp/src/qpid/sys/Time.h | 2 +- qpid/cpp/src/qpid/sys/alloca.h | 39 ++++ qpid/cpp/src/tests/FieldTable.cpp | 2 +- qpid/cpp/src/tests/MessageTest.cpp | 5 +- qpid/cpp/src/tests/ProxyTest.cpp | 1 - qpid/cpp/src/tests/TimerTest.cpp | 4 + qpid/cpp/src/tests/Uuid.cpp | 2 +- qpid/cpp/src/tests/client_test.vcproj | 34 +-- qpid/cpp/src/tests/consume.vcproj | 34 +-- qpid/cpp/src/tests/echotest.vcproj | 34 +-- qpid/cpp/src/tests/header_test.vcproj | 34 +-- qpid/cpp/src/tests/latencytest.vcproj | 34 +-- qpid/cpp/src/tests/logging.cpp | 14 ++ qpid/cpp/src/tests/perftest.cpp | 7 +- qpid/cpp/src/tests/perftest.vcproj | 34 +-- qpid/cpp/src/tests/publish.vcproj | 34 +-- qpid/cpp/src/tests/receiver.vcproj | 34 +-- qpid/cpp/src/tests/sender.vcproj | 34 +-- qpid/cpp/src/tests/shlibtest.vcproj | 91 ++++++-- qpid/cpp/src/tests/tests.sln | 290 ++++++++++++------------ qpid/cpp/src/tests/topic_listener.cpp | 3 +- qpid/cpp/src/tests/topic_listener.vcproj | 34 +-- qpid/cpp/src/tests/topic_publisher.vcproj | 34 +-- qpid/cpp/src/tests/txjob.vcproj | 34 +-- qpid/cpp/src/tests/txshift.vcproj | 34 +-- qpid/cpp/src/tests/txtest.vcproj | 34 +-- qpid/cpp/src/tests/unit_test.vcproj | 104 +++++++-- 58 files changed, 900 insertions(+), 636 deletions(-) create mode 100644 qpid/cpp/src/qpid/console/ConsoleImportExport.h create mode 100644 qpid/cpp/src/qpid/sys/alloca.h diff --git a/qpid/cpp/src/qmfconsole.vcproj b/qpid/cpp/src/qmfconsole.vcproj index c37055adec..49fd065c8e 100644 --- a/qpid/cpp/src/qmfconsole.vcproj +++ b/qpid/cpp/src/qmfconsole.vcproj @@ -1,33 +1,12 @@ - - + @@ -111,17 +100,19 @@ + @@ -168,12 +162,24 @@ Name="VCPreLinkEventTool" /> + @@ -183,17 +189,19 @@ + @@ -243,12 +248,25 @@ Name="VCPreLinkEventTool" /> + @@ -258,6 +276,9 @@ + @@ -265,10 +286,9 @@ + @@ -330,6 +364,9 @@ + @@ -340,79 +377,104 @@ + Filter="cpp;cxx;cc;C;c" + > + RelativePath="qpid\console\Agent.cpp" + > + RelativePath="qpid\console\Broker.cpp" + > + RelativePath="qpid\console\ClassKey.cpp" + > + RelativePath="qpid\console\Event.cpp" + > + RelativePath="qpid\console\Object.cpp" + > + RelativePath="qpid\console\ObjectId.cpp" + > + RelativePath="qpid\console\Package.cpp" + > + RelativePath="qpid\console\Schema.cpp" + > + RelativePath="qpid\console\SequenceManager.cpp" + > + RelativePath="qpid\console\SessionManager.cpp" + > + RelativePath="qpid\console\Value.cpp" + > + Filter="h;hpp;hxx;hh" + > + RelativePath="qpid\console\Agent.h" + > + RelativePath="qpid\console\Broker.h" + > + RelativePath="qpid\console\ClassKey.h" + > + RelativePath="qpid\console\ConsoleListener.h" + > + RelativePath="qpid\console\Event.h" + > + RelativePath="qpid\console\Object.h" + > + RelativePath="qpid\console\ObjectId.h" + > + RelativePath="qpid\console\Package.h" + > + RelativePath="qpid\console\Schema.h" + > + RelativePath="qpid\console\SequenceManager.h" + > + RelativePath="qpid\console\SessionManager.h" + > + RelativePath="qpid\console\Value.h" + > diff --git a/qpid/cpp/src/qpid/SessionId.h b/qpid/cpp/src/qpid/SessionId.h index 318782ecd3..bf52f9856b 100644 --- a/qpid/cpp/src/qpid/SessionId.h +++ b/qpid/cpp/src/qpid/SessionId.h @@ -49,7 +49,7 @@ class SessionId : boost::totally_ordered1 { QPID_COMMON_EXTERN bool operator<(const SessionId&) const ; QPID_COMMON_EXTERN bool operator==(const SessionId& id) const; // Convert to a string - std::string str() const; + QPID_COMMON_EXTERN std::string str() const; }; QPID_COMMON_EXTERN std::ostream& operator<<(std::ostream&, const SessionId&); diff --git a/qpid/cpp/src/qpid/SessionState.h b/qpid/cpp/src/qpid/SessionState.h index f12cc7b4d8..cdf59506a0 100644 --- a/qpid/cpp/src/qpid/SessionState.h +++ b/qpid/cpp/src/qpid/SessionState.h @@ -51,7 +51,7 @@ struct SessionPoint : boost::totally_ordered1 { QPID_COMMON_EXTERN bool operator==(const SessionPoint&) const; }; -std::ostream& operator<<(std::ostream&, const SessionPoint&); +QPID_COMMON_EXTERN std::ostream& operator<<(std::ostream&, const SessionPoint&); /** * Support for session idempotence barrier and resume as defined in diff --git a/qpid/cpp/src/qpid/client/Future.h b/qpid/cpp/src/qpid/client/Future.h index 67f39cdf3f..ea01522fe8 100644 --- a/qpid/cpp/src/qpid/client/Future.h +++ b/qpid/cpp/src/qpid/client/Future.h @@ -30,6 +30,7 @@ #include "FutureCompletion.h" #include "FutureResult.h" #include "SessionImpl.h" +#include "ClientImportExport.h" namespace qpid { namespace client { @@ -54,9 +55,9 @@ public: } } - void wait(SessionImpl& session); - bool isComplete(SessionImpl& session); - void setFutureResult(boost::shared_ptr r); + QPID_CLIENT_EXTERN void wait(SessionImpl& session); + QPID_CLIENT_EXTERN bool isComplete(SessionImpl& session); + QPID_CLIENT_EXTERN void setFutureResult(boost::shared_ptr r); }; }} diff --git a/qpid/cpp/src/qpid/client/FutureResult.h b/qpid/cpp/src/qpid/client/FutureResult.h index e97d80476d..64428c0341 100644 --- a/qpid/cpp/src/qpid/client/FutureResult.h +++ b/qpid/cpp/src/qpid/client/FutureResult.h @@ -23,6 +23,8 @@ #define _FutureResult_ #include + +#include "ClientImportExport.h" #include "qpid/framing/amqp_framing.h" #include "FutureCompletion.h" @@ -36,7 +38,7 @@ class FutureResult : public FutureCompletion { std::string result; public: - const std::string& getResult(SessionImpl& session) const; + QPID_CLIENT_EXTERN const std::string& getResult(SessionImpl& session) const; void received(const std::string& result); }; diff --git a/qpid/cpp/src/qpid/client/LocalQueue.h b/qpid/cpp/src/qpid/client/LocalQueue.h index 30ea00612d..5b739d4303 100644 --- a/qpid/cpp/src/qpid/client/LocalQueue.h +++ b/qpid/cpp/src/qpid/client/LocalQueue.h @@ -22,6 +22,7 @@ * */ +#include "ClientImportExport.h" #include "qpid/client/Message.h" #include "qpid/client/Subscription.h" #include "qpid/client/Demux.h" @@ -75,16 +76,16 @@ class LocalQueue { * * LocalQueue is an alternative to implementing a MessageListener. */ - LocalQueue(); + QPID_CLIENT_EXTERN LocalQueue(); - ~LocalQueue(); + QPID_CLIENT_EXTERN ~LocalQueue(); /** Wait up to timeout for the next message from the local queue. *@param result Set to the message from the queue. *@param timeout wait up this timeout for a message to appear. *@return true if result was set, false if queue was empty after timeout. */ - bool get(Message& result, sys::Duration timeout=0); + QPID_CLIENT_EXTERN bool get(Message& result, sys::Duration timeout=0); /** Get the next message off the local queue, or wait up to the timeout * for message from the broker queue. @@ -92,16 +93,16 @@ class LocalQueue { *@return message from the queue. *@throw ClosedException if subscription is closed or timeout exceeded. */ - Message get(sys::Duration timeout=sys::TIME_INFINITE); + QPID_CLIENT_EXTERN Message get(sys::Duration timeout=sys::TIME_INFINITE); /** Synonym for get() */ - Message pop(sys::Duration timeout=sys::TIME_INFINITE); + QPID_CLIENT_EXTERN Message pop(sys::Duration timeout=sys::TIME_INFINITE); /** Return true if local queue is empty. */ - bool empty() const; + QPID_CLIENT_EXTERN bool empty() const; /** Number of messages on the local queue */ - size_t size() const; + QPID_CLIENT_EXTERN size_t size() const; private: Demux::QueuePtr queue; diff --git a/qpid/cpp/src/qpid/client/QueueOptions.h b/qpid/cpp/src/qpid/client/QueueOptions.h index d159378198..57d9487217 100644 --- a/qpid/cpp/src/qpid/client/QueueOptions.h +++ b/qpid/cpp/src/qpid/client/QueueOptions.h @@ -18,6 +18,8 @@ * under the License. * */ + +#include "ClientImportExport.h" #include "qpid/framing/FieldTable.h" #ifndef _QueueOptions_ @@ -36,8 +38,8 @@ enum QueueOrderingPolicy {FIFO, LVQ, LVQ_NO_BROWSE}; class QueueOptions: public framing::FieldTable { public: - QueueOptions(); - virtual ~QueueOptions(); + QPID_CLIENT_EXTERN QueueOptions(); + QPID_CLIENT_EXTERN virtual ~QueueOptions(); /** * Sets the queue sizing policy @@ -51,58 +53,58 @@ class QueueOptions: public framing::FieldTable * @param maxSize Set the max number of bytes for the sizing policies * @param setMaxCount Set the max number of messages for the sizing policies */ - void setSizePolicy(QueueSizePolicy sp, uint64_t maxSize, uint32_t maxCount ); + QPID_CLIENT_EXTERN void setSizePolicy(QueueSizePolicy sp, uint64_t maxSize, uint32_t maxCount ); /** * Enables the persisting of a queue to the store module when a cluster fails down to it's last * node. Does so optimistically. Will start persisting when cluster count >1 again. */ - void setPersistLastNode(); + QPID_CLIENT_EXTERN void setPersistLastNode(); /** * Sets the odering policy on the Queue, default ordering is FIFO. */ - void setOrdering(QueueOrderingPolicy op); + QPID_CLIENT_EXTERN void setOrdering(QueueOrderingPolicy op); /** * Use broker defualt sizing ploicy */ - void clearSizePolicy(); + QPID_CLIENT_EXTERN void clearSizePolicy(); /** * Clear Persist Last Node Policy */ - void clearPersistLastNode(); + QPID_CLIENT_EXTERN void clearPersistLastNode(); /** * get the key used match LVQ in args for message transfer */ - void getLVQKey(std::string& key); + QPID_CLIENT_EXTERN void getLVQKey(std::string& key); /** * Use default odering policy */ - void clearOrdering(); + QPID_CLIENT_EXTERN void clearOrdering(); /** * Turns on event generation for this queue (either enqueue only * or for enqueue and dequeue events); the events can then be * processed by a regsitered broker plugin. */ - void enableQueueEvents(bool enqueueOnly); + QPID_CLIENT_EXTERN void enableQueueEvents(bool enqueueOnly); - static const std::string strMaxCountKey; - static const std::string strMaxSizeKey; - static const std::string strTypeKey; - static const std::string strREJECT; - static const std::string strFLOW_TO_DISK; - static const std::string strRING; - static const std::string strRING_STRICT; - static const std::string strLastValueQueue; - static const std::string strPersistLastNode; - static const std::string strLVQMatchProperty; - static const std::string strLastValueQueueNoBrowse; - static const std::string strQueueEventMode; + static QPID_CLIENT_EXTERN const std::string strMaxCountKey; + static QPID_CLIENT_EXTERN const std::string strMaxSizeKey; + static QPID_CLIENT_EXTERN const std::string strTypeKey; + static QPID_CLIENT_EXTERN const std::string strREJECT; + static QPID_CLIENT_EXTERN const std::string strFLOW_TO_DISK; + static QPID_CLIENT_EXTERN const std::string strRING; + static QPID_CLIENT_EXTERN const std::string strRING_STRICT; + static QPID_CLIENT_EXTERN const std::string strLastValueQueue; + static QPID_CLIENT_EXTERN const std::string strPersistLastNode; + static QPID_CLIENT_EXTERN const std::string strLVQMatchProperty; + static QPID_CLIENT_EXTERN const std::string strLastValueQueueNoBrowse; + static QPID_CLIENT_EXTERN const std::string strQueueEventMode; }; } diff --git a/qpid/cpp/src/qpid/client/Subscription.h b/qpid/cpp/src/qpid/client/Subscription.h index 4a3b9a5098..43c6100254 100644 --- a/qpid/cpp/src/qpid/client/Subscription.h +++ b/qpid/cpp/src/qpid/client/Subscription.h @@ -42,7 +42,7 @@ class Subscription : public Handle { public: QPID_CLIENT_EXTERN Subscription(SubscriptionImpl* si=0) : Handle(si) {} - /** The name of the subsctription, used as the "destination" for messages from the broker. + /** The name of the subscription, used as the "destination" for messages from the broker. * Usually the same as the queue name but can be set differently. */ QPID_CLIENT_EXTERN std::string getName() const; diff --git a/qpid/cpp/src/qpid/console/Agent.h b/qpid/cpp/src/qpid/console/Agent.h index 3307a1b44b..884d4c92bd 100644 --- a/qpid/cpp/src/qpid/console/Agent.h +++ b/qpid/cpp/src/qpid/console/Agent.h @@ -22,6 +22,7 @@ #define _QPID_CONSOLE_AGENT_H_ #include "Broker.h" +#include "ConsoleImportExport.h" namespace qpid { namespace console { @@ -30,7 +31,7 @@ namespace console { * * \ingroup qmfconsoleapi */ - class Agent { + class QPID_CONSOLE_EXTERN Agent { public: typedef std::vector Vector; @@ -49,7 +50,7 @@ namespace console { const std::string label; }; - std::ostream& operator<<(std::ostream& o, const Agent& agent); + QPID_CONSOLE_EXTERN std::ostream& operator<<(std::ostream& o, const Agent& agent); } } diff --git a/qpid/cpp/src/qpid/console/Broker.h b/qpid/cpp/src/qpid/console/Broker.h index 9df2380dff..71c7c745a1 100644 --- a/qpid/cpp/src/qpid/console/Broker.h +++ b/qpid/cpp/src/qpid/console/Broker.h @@ -21,6 +21,7 @@ #ifndef _QPID_CONSOLE_BROKER_H_ #define _QPID_CONSOLE_BROKER_H_ +#include "ConsoleImportExport.h" #include "qpid/client/Connection.h" #include "qpid/client/ConnectionSettings.h" #include "qpid/client/SubscriptionManager.h" @@ -61,7 +62,7 @@ namespace console { void addBinding(const std::string& key) { connThreadBody.bindExchange("qpid.management", key); } - std::string getUrl() const; + QPID_CONSOLE_EXTERN std::string getUrl() const; private: friend class SessionManager; @@ -120,10 +121,10 @@ namespace console { void setBrokerId(const framing::Uuid& id) { brokerId = id; } void appendAgents(std::vector& agents) const; - friend std::ostream& operator<<(std::ostream& o, const Broker& k); + friend QPID_CONSOLE_EXTERN std::ostream& operator<<(std::ostream& o, const Broker& k); }; - std::ostream& operator<<(std::ostream& o, const Broker& k); + QPID_CONSOLE_EXTERN std::ostream& operator<<(std::ostream& o, const Broker& k); } } diff --git a/qpid/cpp/src/qpid/console/ClassKey.h b/qpid/cpp/src/qpid/console/ClassKey.h index f6617e22d5..821b01c4ef 100644 --- a/qpid/cpp/src/qpid/console/ClassKey.h +++ b/qpid/cpp/src/qpid/console/ClassKey.h @@ -22,6 +22,7 @@ #define _QPID_CONSOLE_CLASSKEY_H_ #include +#include "ConsoleImportExport.h" #include "Package.h" #include "qpid/framing/Buffer.h" @@ -32,7 +33,7 @@ namespace console { * * \ingroup qmfconsoleapi */ - class ClassKey { + class QPID_CONSOLE_EXTERN ClassKey { public: static const int HASH_SIZE = 16; @@ -57,7 +58,7 @@ namespace console { uint8_t hash[HASH_SIZE]; }; - std::ostream& operator<<(std::ostream& o, const ClassKey& k); + QPID_CONSOLE_EXTERN std::ostream& operator<<(std::ostream& o, const ClassKey& k); } } diff --git a/qpid/cpp/src/qpid/console/ConsoleImportExport.h b/qpid/cpp/src/qpid/console/ConsoleImportExport.h new file mode 100644 index 0000000000..e2d0af9db3 --- /dev/null +++ b/qpid/cpp/src/qpid/console/ConsoleImportExport.h @@ -0,0 +1,33 @@ +#ifndef QPID_CONSOLE_IMPORT_EXPORT_H +#define QPID_CONSOLE_IMPORT_EXPORT_H + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +#if defined(WIN32) && !defined(QPID_DECLARE_STATIC) +#if defined(CONSOLE_EXPORT) +#define QPID_CONSOLE_EXTERN __declspec(dllexport) +#else +#define QPID_CONSOLE_EXTERN __declspec(dllimport) +#endif +#else +#define QPID_CONSOLE_EXTERN +#endif + +#endif diff --git a/qpid/cpp/src/qpid/console/ConsoleListener.h b/qpid/cpp/src/qpid/console/ConsoleListener.h index d0db6034f6..d661c63120 100644 --- a/qpid/cpp/src/qpid/console/ConsoleListener.h +++ b/qpid/cpp/src/qpid/console/ConsoleListener.h @@ -22,6 +22,7 @@ #define _QPID_CONSOLE_CONSOLE_LISTENER_H_ #include +#include "ConsoleImportExport.h" #include "Broker.h" #include "ClassKey.h" #include "Object.h" @@ -36,7 +37,7 @@ namespace console { * * \ingroup qmfconsoleapi */ - class ConsoleListener{ + class QPID_CONSOLE_EXTERN ConsoleListener{ public: virtual ~ConsoleListener() {}; diff --git a/qpid/cpp/src/qpid/console/Event.h b/qpid/cpp/src/qpid/console/Event.h index 14f5a64716..5d41af6864 100644 --- a/qpid/cpp/src/qpid/console/Event.h +++ b/qpid/cpp/src/qpid/console/Event.h @@ -21,6 +21,7 @@ #ifndef _QPID_CONSOLE_EVENT_H_ #define _QPID_CONSOLE_EVENT_H_ +#include "ConsoleImportExport.h" #include "Object.h" #include "qpid/framing/Uuid.h" #include "qpid/framing/FieldTable.h" @@ -75,7 +76,7 @@ namespace console { Object::AttributeMap attributes; }; - std::ostream& operator<<(std::ostream& o, const Event& event); + QPID_CONSOLE_EXTERN std::ostream& operator<<(std::ostream& o, const Event& event); } } diff --git a/qpid/cpp/src/qpid/console/Object.h b/qpid/cpp/src/qpid/console/Object.h index 2c6993fc8a..1f1e02463d 100644 --- a/qpid/cpp/src/qpid/console/Object.h +++ b/qpid/cpp/src/qpid/console/Object.h @@ -21,6 +21,7 @@ #ifndef _QPID_CONSOLE_OBJECT_H_ #define _QPID_CONSOLE_OBJECT_H_ +#include "ConsoleImportExport.h" #include "ObjectId.h" #include "qpid/framing/Uuid.h" #include "qpid/framing/FieldTable.h" @@ -55,21 +56,21 @@ namespace console { public: typedef std::vector Vector; struct AttributeMap : public std::map > { - void addRef(const std::string& key, const ObjectId& val); - void addUint(const std::string& key, uint32_t val); - void addInt(const std::string& key, int32_t val); - void addUint64(const std::string& key, uint64_t val); - void addInt64(const std::string& key, int64_t val); - void addString(const std::string& key, const std::string& val); - void addBool(const std::string& key, bool val); - void addFloat(const std::string& key, float val); - void addDouble(const std::string& key, double val); - void addUuid(const std::string& key, const framing::Uuid& val); - void addMap(const std::string& key, const framing::FieldTable& val); + QPID_CONSOLE_EXTERN void addRef(const std::string& key, const ObjectId& val); + QPID_CONSOLE_EXTERN void addUint(const std::string& key, uint32_t val); + QPID_CONSOLE_EXTERN void addInt(const std::string& key, int32_t val); + QPID_CONSOLE_EXTERN void addUint64(const std::string& key, uint64_t val); + QPID_CONSOLE_EXTERN void addInt64(const std::string& key, int64_t val); + QPID_CONSOLE_EXTERN void addString(const std::string& key, const std::string& val); + QPID_CONSOLE_EXTERN void addBool(const std::string& key, bool val); + QPID_CONSOLE_EXTERN void addFloat(const std::string& key, float val); + QPID_CONSOLE_EXTERN void addDouble(const std::string& key, double val); + QPID_CONSOLE_EXTERN void addUuid(const std::string& key, const framing::Uuid& val); + QPID_CONSOLE_EXTERN void addMap(const std::string& key, const framing::FieldTable& val); }; - Object(Broker* broker, SchemaClass* schemaClass, framing::Buffer& buffer, bool prop, bool stat); - ~Object(); + QPID_CONSOLE_EXTERN Object(Broker* broker, SchemaClass* schemaClass, framing::Buffer& buffer, bool prop, bool stat); + QPID_CONSOLE_EXTERN ~Object(); Broker* getBroker() const { return broker; } const ObjectId& getObjectId() const { return objectId; } @@ -111,7 +112,7 @@ namespace console { void parsePresenceMasks(framing::Buffer& buffer, std::set& excludeList); }; - std::ostream& operator<<(std::ostream& o, const Object& object); + QPID_CONSOLE_EXTERN std::ostream& operator<<(std::ostream& o, const Object& object); } } diff --git a/qpid/cpp/src/qpid/console/ObjectId.h b/qpid/cpp/src/qpid/console/ObjectId.h index 73304ca306..ac0e8d8b03 100644 --- a/qpid/cpp/src/qpid/console/ObjectId.h +++ b/qpid/cpp/src/qpid/console/ObjectId.h @@ -22,6 +22,7 @@ #define _QPID_CONSOLE_OBJECTID_H #include +#include "ConsoleImportExport.h" #include "qpid/sys/IntegerTypes.h" namespace qpid { @@ -34,7 +35,7 @@ namespace console { * * \ingroup qmfconsoleapi */ - class ObjectId { + class QPID_CONSOLE_EXTERN ObjectId { public: ObjectId() : first(0), second(0) {} ObjectId(framing::Buffer& buffer); @@ -61,7 +62,7 @@ namespace console { uint64_t second; }; - std::ostream& operator<<(std::ostream& o, const ObjectId& id); + QPID_CONSOLE_EXTERN std::ostream& operator<<(std::ostream& o, const ObjectId& id); } } diff --git a/qpid/cpp/src/qpid/console/Package.h b/qpid/cpp/src/qpid/console/Package.h index 18203cb807..3cc63c8b75 100644 --- a/qpid/cpp/src/qpid/console/Package.h +++ b/qpid/cpp/src/qpid/console/Package.h @@ -23,6 +23,7 @@ #include #include +#include "ConsoleImportExport.h" #include "qpid/sys/IntegerTypes.h" namespace qpid { diff --git a/qpid/cpp/src/qpid/console/SequenceManager.h b/qpid/cpp/src/qpid/console/SequenceManager.h index c7a8c20fe6..5a041f530b 100644 --- a/qpid/cpp/src/qpid/console/SequenceManager.h +++ b/qpid/cpp/src/qpid/console/SequenceManager.h @@ -21,6 +21,7 @@ #ifndef _QPID_CONSOLE_SEQUENCEMANAGER_H_ #define _QPID_CONSOLE_SEQUENCEMANAGER_H_ +#include "ConsoleImportExport.h" #include "qpid/sys/Mutex.h" #include #include @@ -38,8 +39,8 @@ namespace console { typedef std::set set; SequenceManager() : sequence(0) {} - uint32_t reserve(const std::string& context = ""); - std::string release(uint32_t seq); + QPID_CONSOLE_EXTERN uint32_t reserve(const std::string& context = ""); + QPID_CONSOLE_EXTERN std::string release(uint32_t seq); private: sys::Mutex lock; diff --git a/qpid/cpp/src/qpid/framing/AccumulatedAck.h b/qpid/cpp/src/qpid/framing/AccumulatedAck.h index e221aff9db..ede73897c7 100644 --- a/qpid/cpp/src/qpid/framing/AccumulatedAck.h +++ b/qpid/cpp/src/qpid/framing/AccumulatedAck.h @@ -59,13 +59,13 @@ namespace qpid { */ std::list ranges; - explicit AccumulatedAck(SequenceNumber r = SequenceNumber()); - void update(SequenceNumber firstTag, SequenceNumber lastTag); - void consolidate(); - void clear(); - bool covers(SequenceNumber tag) const; + QPID_COMMON_EXTERN explicit AccumulatedAck(SequenceNumber r = SequenceNumber()); + QPID_COMMON_EXTERN void update(SequenceNumber firstTag, SequenceNumber lastTag); + QPID_COMMON_EXTERN void consolidate(); + QPID_COMMON_EXTERN void clear(); + QPID_COMMON_EXTERN bool covers(SequenceNumber tag) const; void collectRanges(SequenceNumberSet& set) const; - void update(const SequenceNumber cumulative, const SequenceNumberSet& range); + QPID_COMMON_EXTERN void update(const SequenceNumber cumulative, const SequenceNumberSet& range); void operator()(SequenceNumber first, SequenceNumber last) { update(first, last); } }; QPID_COMMON_EXTERN std::ostream& operator<<(std::ostream&, const Range&); diff --git a/qpid/cpp/src/qpid/framing/Array.h b/qpid/cpp/src/qpid/framing/Array.h index e714b7133f..0b6b704ed2 100644 --- a/qpid/cpp/src/qpid/framing/Array.h +++ b/qpid/cpp/src/qpid/framing/Array.h @@ -47,7 +47,7 @@ class Array QPID_COMMON_EXTERN void decode(Buffer& buffer); QPID_COMMON_EXTERN int count() const; - bool operator==(const Array& other) const; + QPID_COMMON_EXTERN bool operator==(const Array& other) const; QPID_COMMON_EXTERN Array(); QPID_COMMON_EXTERN Array(TypeCode type); @@ -87,7 +87,7 @@ class Array TypeCode type; ValueVector values; - friend std::ostream& operator<<(std::ostream& out, const Array& body); + friend QPID_COMMON_EXTERN std::ostream& operator<<(std::ostream& out, const Array& body); }; } diff --git a/qpid/cpp/src/qpid/framing/FieldValue.h b/qpid/cpp/src/qpid/framing/FieldValue.h index b66000d9fa..0f27700ac8 100644 --- a/qpid/cpp/src/qpid/framing/FieldValue.h +++ b/qpid/cpp/src/qpid/framing/FieldValue.h @@ -245,7 +245,7 @@ class EncodedValue : public FieldValue::Data { class Str8Value : public FieldValue { public: - Str8Value(const std::string& v); + QPID_COMMON_EXTERN Str8Value(const std::string& v); }; class Str16Value : public FieldValue { @@ -261,12 +261,12 @@ class Struct32Value : public FieldValue { class FloatValue : public FieldValue { public: - FloatValue(float f); + QPID_COMMON_EXTERN FloatValue(float f); }; class DoubleValue : public FieldValue { public: - DoubleValue(double f); + QPID_COMMON_EXTERN DoubleValue(double f); }; /* @@ -274,32 +274,32 @@ class DoubleValue : public FieldValue */ class IntegerValue : public FieldValue { public: - IntegerValue(int v); + QPID_COMMON_EXTERN IntegerValue(int v); }; class TimeValue : public FieldValue { public: - TimeValue(uint64_t v); + QPID_COMMON_EXTERN TimeValue(uint64_t v); }; class Integer64Value : public FieldValue { public: - Integer64Value(int64_t v); + QPID_COMMON_EXTERN Integer64Value(int64_t v); }; class Unsigned64Value : public FieldValue { public: - Unsigned64Value(uint64_t v); + QPID_COMMON_EXTERN Unsigned64Value(uint64_t v); }; class FieldTableValue : public FieldValue { public: - FieldTableValue(const FieldTable&); + QPID_COMMON_EXTERN FieldTableValue(const FieldTable&); }; class ArrayValue : public FieldValue { public: - ArrayValue(const Array&); + QPID_COMMON_EXTERN ArrayValue(const Array&); }; template diff --git a/qpid/cpp/src/qpid/framing/SequenceNumberSet.h b/qpid/cpp/src/qpid/framing/SequenceNumberSet.h index 5ca40340b8..8e023ba535 100644 --- a/qpid/cpp/src/qpid/framing/SequenceNumberSet.h +++ b/qpid/cpp/src/qpid/framing/SequenceNumberSet.h @@ -43,7 +43,7 @@ public: void decode(Buffer& buffer); uint32_t encodedSize() const; QPID_COMMON_EXTERN SequenceNumberSet condense() const; - void addRange(const SequenceNumber& start, const SequenceNumber& end); + QPID_COMMON_EXTERN void addRange(const SequenceNumber& start, const SequenceNumber& end); template void processRanges(T& t) const @@ -59,7 +59,7 @@ public: } } - friend std::ostream& operator<<(std::ostream&, const SequenceNumberSet&); + friend QPID_COMMON_EXTERN std::ostream& operator<<(std::ostream&, const SequenceNumberSet&); }; diff --git a/qpid/cpp/src/qpid/framing/SequenceSet.h b/qpid/cpp/src/qpid/framing/SequenceSet.h index b5db9af76f..a5ee6cd649 100644 --- a/qpid/cpp/src/qpid/framing/SequenceSet.h +++ b/qpid/cpp/src/qpid/framing/SequenceSet.h @@ -60,7 +60,7 @@ class SequenceSet : public RangeSet { t(i->first(), i->last()); } - friend std::ostream& operator<<(std::ostream&, const SequenceSet&); + friend QPID_COMMON_EXTERN std::ostream& operator<<(std::ostream&, const SequenceSet&); }; }} // namespace qpid::framing diff --git a/qpid/cpp/src/qpid/log/Logger.h b/qpid/cpp/src/qpid/log/Logger.h index aba6999f79..0cbd7685d6 100644 --- a/qpid/cpp/src/qpid/log/Logger.h +++ b/qpid/cpp/src/qpid/log/Logger.h @@ -49,8 +49,8 @@ class Logger : private boost::noncopyable { */ class Output { public: - Output(); - virtual ~Output(); + QPID_COMMON_EXTERN Output(); + QPID_COMMON_EXTERN virtual ~Output(); /** Receives the statemnt of origin and formatted message to log. */ virtual void log(const Statement&, const std::string&) =0; }; diff --git a/qpid/cpp/src/qpid/log/OstreamOutput.h b/qpid/cpp/src/qpid/log/OstreamOutput.h index 8bbfc8c38b..8df38468ad 100644 --- a/qpid/cpp/src/qpid/log/OstreamOutput.h +++ b/qpid/cpp/src/qpid/log/OstreamOutput.h @@ -26,8 +26,8 @@ namespace log { */ class OstreamOutput : public qpid::log::Logger::Output { public: - OstreamOutput(std::ostream& o); - OstreamOutput(const std::string& file); + QPID_COMMON_EXTERN OstreamOutput(std::ostream& o); + QPID_COMMON_EXTERN OstreamOutput(const std::string& file); virtual void log(const Statement&, const std::string& m); diff --git a/qpid/cpp/src/qpid/log/Selector.h b/qpid/cpp/src/qpid/log/Selector.h index 705abfeb5d..070ffd4abf 100644 --- a/qpid/cpp/src/qpid/log/Selector.h +++ b/qpid/cpp/src/qpid/log/Selector.h @@ -20,6 +20,7 @@ */ #include "Statement.h" +#include "qpid/CommonImportExport.h" #include namespace qpid { @@ -37,7 +38,7 @@ class Selector { Selector() {} /** Set selector from Options */ - Selector(const Options&); + QPID_COMMON_EXTERN Selector(const Options&); /** Equavlient to: Selector s; s.enable(l, s) */ Selector(Level l, const std::string& s=std::string()) { @@ -54,10 +55,10 @@ class Selector { } /** Enable based on a 'level[+]:file' string */ - void enable(const std::string& enableStr); + QPID_COMMON_EXTERN void enable(const std::string& enableStr); /** True if level is enabled for file. */ - bool isEnabled(Level level, const char* function); + QPID_COMMON_EXTERN bool isEnabled(Level level, const char* function); private: std::vector substrings[LevelTraits::COUNT]; diff --git a/qpid/cpp/src/qpid/log/windows/SinkOptions.h b/qpid/cpp/src/qpid/log/windows/SinkOptions.h index d14e9352be..605822fd46 100644 --- a/qpid/cpp/src/qpid/log/windows/SinkOptions.h +++ b/qpid/cpp/src/qpid/log/windows/SinkOptions.h @@ -27,20 +27,20 @@ namespace log { namespace windows { struct SinkOptions : public qpid::log::SinkOptions { - SinkOptions(const std::string& argv0); + QPID_COMMON_EXTERN SinkOptions(const std::string& argv0); virtual ~SinkOptions() {} - virtual qpid::log::SinkOptions& operator=(const qpid::log::SinkOptions& rhs); + QPID_COMMON_EXTERN virtual qpid::log::SinkOptions& operator=(const qpid::log::SinkOptions& rhs); // This allows the caller to indicate that there's no normal outputs // available. For example, when running as a service. In these cases, the // platform's "syslog"-type output should replace the default stderr // unless some other sink has been selected. - virtual void detached(void); + QPID_COMMON_EXTERN virtual void detached(void); // The Logger acting on these options calls setup() to request any // Sinks be set up and fed back to the logger. - virtual void setup(qpid::log::Logger *logger); + QPID_COMMON_EXTERN virtual void setup(qpid::log::Logger *logger); bool logToStderr; bool logToStdout; diff --git a/qpid/cpp/src/qpid/management/Manageable.h b/qpid/cpp/src/qpid/management/Manageable.h index d4c1a5e100..ededa6141e 100644 --- a/qpid/cpp/src/qpid/management/Manageable.h +++ b/qpid/cpp/src/qpid/management/Manageable.h @@ -28,7 +28,7 @@ namespace qpid { namespace management { -class Manageable +class QPID_COMMON_EXTERN Manageable { public: @@ -37,7 +37,7 @@ class Manageable // status_t is a type used to pass completion status from the method handler. // typedef uint32_t status_t; - QPID_COMMON_EXTERN static std::string StatusText(status_t status, std::string text = std::string()); + static std::string StatusText(status_t status, std::string text = std::string()); static const status_t STATUS_OK = 0; static const status_t STATUS_UNKNOWN_OBJECT = 1; @@ -62,7 +62,7 @@ class Manageable // on this object. The input and output arguments are specific to the // method being called and must be down-cast to the appropriate sub class // before use. - QPID_COMMON_EXTERN virtual status_t ManagementMethod(uint32_t methodId, Args& args, std::string& text); + virtual status_t ManagementMethod(uint32_t methodId, Args& args, std::string& text); }; inline Manageable::~Manageable(void) {} diff --git a/qpid/cpp/src/qpid/management/ManagementObject.h b/qpid/cpp/src/qpid/management/ManagementObject.h index 768578ef2f..498169318d 100644 --- a/qpid/cpp/src/qpid/management/ManagementObject.h +++ b/qpid/cpp/src/qpid/management/ManagementObject.h @@ -42,7 +42,7 @@ private: uint64_t first; public: AgentAttachment() : first(0) {} - void setBanks(uint32_t broker, uint32_t bank); + QPID_COMMON_EXTERN void setBanks(uint32_t broker, uint32_t bank); uint64_t getFirst() const { return first; } }; @@ -64,7 +64,7 @@ public: QPID_COMMON_EXTERN bool operator<(const ObjectId &other) const; QPID_COMMON_EXTERN void encode(framing::Buffer& buffer); QPID_COMMON_EXTERN void decode(framing::Buffer& buffer); - friend std::ostream& operator<<(std::ostream&, const ObjectId&); + friend QPID_COMMON_EXTERN std::ostream& operator<<(std::ostream&, const ObjectId&); }; class ManagementItem { diff --git a/qpid/cpp/src/qpid/sys/Shlib.h b/qpid/cpp/src/qpid/sys/Shlib.h index a6d94b42d4..7f66cfec14 100644 --- a/qpid/cpp/src/qpid/sys/Shlib.h +++ b/qpid/cpp/src/qpid/sys/Shlib.h @@ -21,7 +21,8 @@ * under the License. * */ - + +#include "qpid/CommonImportExport.h" #include #include @@ -40,10 +41,10 @@ class Shlib { Shlib(const std::string& libname) { load(libname.c_str()); } /** Unload shared library. */ - void unload(); + QPID_COMMON_EXTERN void unload(); /** Look up symbol. */ - void* getSymbol(const char* symbol); + QPID_COMMON_EXTERN void* getSymbol(const char* symbol); /** Look up symbol in shared library, cast it to the desired * pointer type, void* by default. @@ -57,7 +58,7 @@ class Shlib { private: void* handle; - void load(const char* libname); + QPID_COMMON_EXTERN void load(const char* libname); }; /** A shared library handle that unloads the shlib in it's dtor */ @@ -66,7 +67,7 @@ class AutoShlib : public Shlib { /** Load shared library */ AutoShlib(const std::string& libname) : Shlib(libname) {} /** Calls unload() */ - ~AutoShlib() throw(); + QPID_COMMON_EXTERN ~AutoShlib() throw(); }; diff --git a/qpid/cpp/src/qpid/sys/Socket.h b/qpid/cpp/src/qpid/sys/Socket.h index f828d255bd..a81d823d0c 100644 --- a/qpid/cpp/src/qpid/sys/Socket.h +++ b/qpid/cpp/src/qpid/sys/Socket.h @@ -93,11 +93,11 @@ public: /** Accept a connection from a socket that is already listening * and has an incoming connection */ - Socket* accept(struct sockaddr *addr, socklen_t *addrlen) const; + QPID_COMMON_EXTERN Socket* accept(struct sockaddr *addr, socklen_t *addrlen) const; // TODO The following are raw operations, maybe they need better wrapping? - int read(void *buf, size_t count) const; - int write(const void *buf, size_t count) const; + QPID_COMMON_EXTERN int read(void *buf, size_t count) const; + QPID_COMMON_EXTERN int write(const void *buf, size_t count) const; QPID_COMMON_EXTERN void setTcpNoDelay(bool nodelay) const; diff --git a/qpid/cpp/src/qpid/sys/Time.h b/qpid/cpp/src/qpid/sys/Time.h index 2c93d64f32..b7173406ca 100644 --- a/qpid/cpp/src/qpid/sys/Time.h +++ b/qpid/cpp/src/qpid/sys/Time.h @@ -163,7 +163,7 @@ const AbsTime FAR_FUTURE = AbsTime::FarFuture(); QPID_COMMON_EXTERN void sleep(int secs); /** Portable sleep for a number of microseconds */ -void usleep(uint64_t usecs); +QPID_COMMON_EXTERN void usleep(uint64_t usecs); }} diff --git a/qpid/cpp/src/qpid/sys/alloca.h b/qpid/cpp/src/qpid/sys/alloca.h new file mode 100644 index 0000000000..e989670e4f --- /dev/null +++ b/qpid/cpp/src/qpid/sys/alloca.h @@ -0,0 +1,39 @@ +#ifndef QPID_SYS_ALLOCA_H +#define QPID_SYS_ALLOCA_H + +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * + */ + +#if (defined(_WINDOWS) || defined (WIN32)) && defined(_MSC_VER) +#include +#ifdef alloc +# undef alloc +#endif +#define alloc _alloc +#ifdef alloca +# undef alloca +#endif +#define alloca _alloca +#endif +#if !defined _WINDOWS && !defined WIN32 +#include +#endif + +#endif /*!QPID_SYS_ALLOCA_H*/ diff --git a/qpid/cpp/src/tests/FieldTable.cpp b/qpid/cpp/src/tests/FieldTable.cpp index 6b364723cf..9f2fd45b73 100644 --- a/qpid/cpp/src/tests/FieldTable.cpp +++ b/qpid/cpp/src/tests/FieldTable.cpp @@ -22,7 +22,7 @@ #include "qpid/framing/Array.h" #include "qpid/framing/FieldTable.h" #include "qpid/framing/FieldValue.h" -#include +#include "qpid/sys/alloca.h" #include "unit_test.h" diff --git a/qpid/cpp/src/tests/MessageTest.cpp b/qpid/cpp/src/tests/MessageTest.cpp index 8fd9a53c7c..cd63f64a37 100644 --- a/qpid/cpp/src/tests/MessageTest.cpp +++ b/qpid/cpp/src/tests/MessageTest.cpp @@ -24,13 +24,12 @@ #include "qpid/framing/MessageTransferBody.h" #include "qpid/framing/FieldValue.h" #include "qpid/framing/Uuid.h" +#include "qpid/sys/alloca.h" #include "unit_test.h" #include -#include -using namespace boost; using namespace qpid::broker; using namespace qpid::framing; @@ -44,7 +43,7 @@ QPID_AUTO_TEST_CASE(testEncodeDecode) string data1("abcdefg"); string data2("hijklmn"); - intrusive_ptr msg(new Message()); + boost::intrusive_ptr msg(new Message()); AMQFrame method((MessageTransferBody(ProtocolVersion(), exchange, 0, 0))); AMQFrame header((AMQHeaderBody())); diff --git a/qpid/cpp/src/tests/ProxyTest.cpp b/qpid/cpp/src/tests/ProxyTest.cpp index 9007f3dc97..4ea10f7be9 100644 --- a/qpid/cpp/src/tests/ProxyTest.cpp +++ b/qpid/cpp/src/tests/ProxyTest.cpp @@ -23,7 +23,6 @@ #include "qpid/framing/AMQMethodBody.h" #include "qpid/framing/ExecutionSyncBody.h" #include "qpid/framing/Proxy.h" -#include #include "unit_test.h" diff --git a/qpid/cpp/src/tests/TimerTest.cpp b/qpid/cpp/src/tests/TimerTest.cpp index 50712ff79c..f8ab9fb2f3 100644 --- a/qpid/cpp/src/tests/TimerTest.cpp +++ b/qpid/cpp/src/tests/TimerTest.cpp @@ -75,7 +75,11 @@ class TestTask : public TimerTask BOOST_CHECK(fired); BOOST_CHECK_EQUAL(expected_position, position); Duration actual(start, end); +#ifdef _WIN32 + uint64_t difference = _abs64(expected - actual); +#else uint64_t difference = abs(expected - actual); +#endif std::string msg(boost::lexical_cast(boost::format("tolerance = %1%, difference = %2%") % tolerance % difference)); BOOST_CHECK_MESSAGE(difference < tolerance, msg); } diff --git a/qpid/cpp/src/tests/Uuid.cpp b/qpid/cpp/src/tests/Uuid.cpp index ee86d75a26..ea2e80b63b 100644 --- a/qpid/cpp/src/tests/Uuid.cpp +++ b/qpid/cpp/src/tests/Uuid.cpp @@ -18,11 +18,11 @@ #include "qpid/framing/Uuid.h" #include "qpid/framing/Buffer.h" +#include "qpid/sys/alloca.h" #include "unit_test.h" #include -#include QPID_AUTO_TEST_SUITE(UuidTestSuite) diff --git a/qpid/cpp/src/tests/client_test.vcproj b/qpid/cpp/src/tests/client_test.vcproj index 0f9a50cdf0..1623c2961e 100644 --- a/qpid/cpp/src/tests/client_test.vcproj +++ b/qpid/cpp/src/tests/client_test.vcproj @@ -3,7 +3,7 @@ ProjectType="Visual C++" Version="9.00" Name="client_test" - ProjectGUID="{9A95F0E4-FECA-1BAD-2235-047BCDC7409E}" + ProjectGUID="{9A95F0E4-FECA-1BAD-2431-8A11DB0D67CE}" RootNamespace="client_test" Keyword="Win32Proj" SignManifests="true" @@ -21,8 +21,8 @@ (argv)); sinks = *opts.sinkOptions; vector expect=list_of("error+:foo")("debug:bar")("info"); @@ -286,7 +291,11 @@ QPID_AUTO_TEST_CASE(testOptionsParse) { QPID_AUTO_TEST_CASE(testOptionsDefault) { Options opts(""); +#ifdef _WIN32 + qpid::log::windows::SinkOptions sinks("test"); +#else qpid::log::posix::SinkOptions sinks("test"); +#endif sinks = *opts.sinkOptions; BOOST_CHECK(sinks.logToStderr); BOOST_CHECK(!sinks.logToStdout); @@ -345,8 +354,13 @@ QPID_AUTO_TEST_CASE(testQuoteNonPrintable) { ScopedSuppressLogging ls(l); Options opts("test"); opts.time=false; +#ifdef _WIN32 + qpid::log::windows::SinkOptions *sinks = + dynamic_cast(opts.sinkOptions.get()); +#else qpid::log::posix::SinkOptions *sinks = dynamic_cast(opts.sinkOptions.get()); +#endif sinks->logToStderr = false; sinks->logFile = "logging.tmp"; l.configure(opts); diff --git a/qpid/cpp/src/tests/perftest.cpp b/qpid/cpp/src/tests/perftest.cpp index 6456bc8304..216d3d98d0 100644 --- a/qpid/cpp/src/tests/perftest.cpp +++ b/qpid/cpp/src/tests/perftest.cpp @@ -38,7 +38,6 @@ #include #include #include -#include #include @@ -523,7 +522,8 @@ struct PublishThread : public Client { sync(session).txCommit(); } } - if (opts.intervalPub) ::usleep(opts.intervalPub*1000); + if (opts.intervalPub) + qpid::sys::usleep(opts.intervalPub*1000); } if (opts.confirm) session.sync(); AbsTime end=now(); @@ -613,7 +613,8 @@ struct SubscribeThread : public Client { if (opts.commitAsync) session.txCommit(); else sync(session).txCommit(); } - if (opts.intervalSub) ::usleep(opts.intervalSub*1000); + if (opts.intervalSub) + qpid::sys::usleep(opts.intervalSub*1000); // TODO aconway 2007-11-23: check message order for. // multiple publishers. Need an array of counters, // one per publisher and a publisher ID in the diff --git a/qpid/cpp/src/tests/perftest.vcproj b/qpid/cpp/src/tests/perftest.vcproj index c9132bac03..3a2397ac9b 100644 --- a/qpid/cpp/src/tests/perftest.vcproj +++ b/qpid/cpp/src/tests/perftest.vcproj @@ -3,7 +3,7 @@ ProjectType="Visual C++" Version="9.00" Name="perftest" - ProjectGUID="{1F2066BE-FECA-1BAD-2235-047BCDC7409E}" + ProjectGUID="{1F2066BE-FECA-1BAD-2431-8A11DB0D67CE}" RootNamespace="perftest" Keyword="Win32Proj" SignManifests="true" @@ -21,8 +21,8 @@ @@ -52,10 +52,10 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\." - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS" + PreprocessorDefinitions="SHLIBTEST_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS" MinimalRebuild="false" BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="3" RuntimeTypeInfo="true" WarningLevel="3" Detect64BitPortabilityProblems="false" @@ -74,8 +74,16 @@ Name="VCPreLinkEventTool" /> @@ -126,8 +134,8 @@ Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\." - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS" - RuntimeLibrary="0" + PreprocessorDefinitions="SHLIBTEST_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS" + RuntimeLibrary="2" RuntimeTypeInfo="true" WarningLevel="3" Detect64BitPortabilityProblems="false" @@ -145,8 +153,18 @@ Name="VCPreLinkEventTool" /> @@ -197,10 +215,10 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\." - PreprocessorDefinitions="_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64" + PreprocessorDefinitions="SHLIBTEST_BUILD_DLL;_DEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64" MinimalRebuild="false" BasicRuntimeChecks="3" - RuntimeLibrary="1" + RuntimeLibrary="3" RuntimeTypeInfo="true" WarningLevel="3" Detect64BitPortabilityProblems="false" @@ -219,8 +237,17 @@ Name="VCPreLinkEventTool" /> @@ -271,8 +298,8 @@ Name="VCCLCompilerTool" Optimization="2" AdditionalIncludeDirectories="$(BOOST_ROOT)\include\$(BOOST_VERSION),$(BOOST_ROOT)\." - PreprocessorDefinitions="NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64" - RuntimeLibrary="0" + PreprocessorDefinitions="SHLIBTEST_BUILD_DLL;NDEBUG;WIN32;_WINDOWS;_CRT_NONSTDC_NO_WARNINGS;_AMD64_;_WIN64" + RuntimeLibrary="2" RuntimeTypeInfo="true" WarningLevel="3" Detect64BitPortabilityProblems="false" @@ -290,8 +317,19 @@ Name="VCPreLinkEventTool" /> + + diff --git a/qpid/cpp/src/tests/tests.sln b/qpid/cpp/src/tests/tests.sln index cee1a45292..273e90d1c8 100644 --- a/qpid/cpp/src/tests/tests.sln +++ b/qpid/cpp/src/tests/tests.sln @@ -7,38 +7,38 @@ Microsoft Visual Studio Solution File, Format Version 10.00 # this file will be lost the next time it is generated. # # MPC Command: -# C:\ace\MPC\mwc.pl -type vc9 -features boost=1 -static tests.mwc -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client_test", "client_test.vcproj", "{9A95F0E4-FECA-1BAD-2235-047BCDC7409E}" +# C:\ace\MPC\mwc.pl -type vc9 -features boost=1 tests.mwc +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client_test", "client_test.vcproj", "{9A95F0E4-FECA-1BAD-2431-8A11DB0D67CE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "consume", "consume.vcproj", "{7F5DE0A1-FECA-1BAD-2235-047BCDC7409E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "consume", "consume.vcproj", "{7F5DE0A1-FECA-1BAD-2431-8A11DB0D67CE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "echotest", "echotest.vcproj", "{0A5AF6BE-FECA-1BAD-2235-047BCDC7409E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "echotest", "echotest.vcproj", "{0A5AF6BE-FECA-1BAD-2431-8A11DB0D67CE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "header_test", "header_test.vcproj", "{1B23F05D-FECA-1BAD-2235-047BCDC7409E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "header_test", "header_test.vcproj", "{1B23F05D-FECA-1BAD-2431-8A11DB0D67CE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "latencytest", "latencytest.vcproj", "{4A809018-FECA-1BAD-2235-047BCDC7409E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "latencytest", "latencytest.vcproj", "{4A809018-FECA-1BAD-2431-8A11DB0D67CE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "perftest", "perftest.vcproj", "{1F2066BE-FECA-1BAD-2235-047BCDC7409E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "perftest", "perftest.vcproj", "{1F2066BE-FECA-1BAD-2431-8A11DB0D67CE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "publish", "publish.vcproj", "{AE773E7F-FECA-1BAD-2235-047BCDC7409E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "publish", "publish.vcproj", "{AE773E7F-FECA-1BAD-2431-8A11DB0D67CE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "receiver", "receiver.vcproj", "{7D314A98-FECA-1BAD-2235-047BCDC7409E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "receiver", "receiver.vcproj", "{7D314A98-FECA-1BAD-2431-8A11DB0D67CE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sender", "sender.vcproj", "{09714CB8-FECA-1BAD-2235-047BCDC7409E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "sender", "sender.vcproj", "{09714CB8-FECA-1BAD-2431-8A11DB0D67CE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shlibtest", "shlibtest.vcproj", "{37AB26B9-FECA-1BAD-2235-047BCDC7409E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "shlibtest", "shlibtest.vcproj", "{37AB26B9-FECA-1BAD-2431-8A11DB0D67CE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "topic_listener", "topic_listener.vcproj", "{9392D1EE-FECA-1BAD-2235-047BCDC7409E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "topic_listener", "topic_listener.vcproj", "{9392D1EE-FECA-1BAD-2431-8A11DB0D67CE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "topic_publisher", "topic_publisher.vcproj", "{7D66FE10-FECA-1BAD-2235-047BCDC7409E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "topic_publisher", "topic_publisher.vcproj", "{7D66FE10-FECA-1BAD-2431-8A11DB0D67CE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "txjob", "txjob.vcproj", "{09034A53-FECA-1BAD-2235-047BCDC7409E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "txjob", "txjob.vcproj", "{09034A53-FECA-1BAD-2431-8A11DB0D67CE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "txshift", "txshift.vcproj", "{6E3B2A6B-FECA-1BAD-2235-047BCDC7409E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "txshift", "txshift.vcproj", "{6E3B2A6B-FECA-1BAD-2431-8A11DB0D67CE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "txtest", "txtest.vcproj", "{697786BE-FECA-1BAD-2235-047BCDC7409E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "txtest", "txtest.vcproj", "{697786BE-FECA-1BAD-2431-8A11DB0D67CE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unit_test", "unit_test.vcproj", "{51E5F6B9-FECA-1BAD-2235-047BCDC7409E}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unit_test", "unit_test.vcproj", "{51E5F6B9-FECA-1BAD-2431-8A11DB0D67CE}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -48,134 +48,134 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {9A95F0E4-FECA-1BAD-2235-047BCDC7409E}.Debug|Win32.ActiveCfg = Debug|Win32 - {9A95F0E4-FECA-1BAD-2235-047BCDC7409E}.Debug|Win32.Build.0 = Debug|Win32 - {9A95F0E4-FECA-1BAD-2235-047BCDC7409E}.Debug|x64.ActiveCfg = Debug|x64 - {9A95F0E4-FECA-1BAD-2235-047BCDC7409E}.Debug|x64.Build.0 = Debug|x64 - {9A95F0E4-FECA-1BAD-2235-047BCDC7409E}.Release|Win32.ActiveCfg = Release|Win32 - {9A95F0E4-FECA-1BAD-2235-047BCDC7409E}.Release|Win32.Build.0 = Release|Win32 - {9A95F0E4-FECA-1BAD-2235-047BCDC7409E}.Release|x64.ActiveCfg = Release|x64 - {9A95F0E4-FECA-1BAD-2235-047BCDC7409E}.Release|x64.Build.0 = Release|x64 - {7F5DE0A1-FECA-1BAD-2235-047BCDC7409E}.Debug|Win32.ActiveCfg = Debug|Win32 - {7F5DE0A1-FECA-1BAD-2235-047BCDC7409E}.Debug|Win32.Build.0 = Debug|Win32 - {7F5DE0A1-FECA-1BAD-2235-047BCDC7409E}.Debug|x64.ActiveCfg = Debug|x64 - {7F5DE0A1-FECA-1BAD-2235-047BCDC7409E}.Debug|x64.Build.0 = Debug|x64 - {7F5DE0A1-FECA-1BAD-2235-047BCDC7409E}.Release|Win32.ActiveCfg = Release|Win32 - {7F5DE0A1-FECA-1BAD-2235-047BCDC7409E}.Release|Win32.Build.0 = Release|Win32 - {7F5DE0A1-FECA-1BAD-2235-047BCDC7409E}.Release|x64.ActiveCfg = Release|x64 - {7F5DE0A1-FECA-1BAD-2235-047BCDC7409E}.Release|x64.Build.0 = Release|x64 - {0A5AF6BE-FECA-1BAD-2235-047BCDC7409E}.Debug|Win32.ActiveCfg = Debug|Win32 - {0A5AF6BE-FECA-1BAD-2235-047BCDC7409E}.Debug|Win32.Build.0 = Debug|Win32 - {0A5AF6BE-FECA-1BAD-2235-047BCDC7409E}.Debug|x64.ActiveCfg = Debug|x64 - {0A5AF6BE-FECA-1BAD-2235-047BCDC7409E}.Debug|x64.Build.0 = Debug|x64 - {0A5AF6BE-FECA-1BAD-2235-047BCDC7409E}.Release|Win32.ActiveCfg = Release|Win32 - {0A5AF6BE-FECA-1BAD-2235-047BCDC7409E}.Release|Win32.Build.0 = Release|Win32 - {0A5AF6BE-FECA-1BAD-2235-047BCDC7409E}.Release|x64.ActiveCfg = Release|x64 - {0A5AF6BE-FECA-1BAD-2235-047BCDC7409E}.Release|x64.Build.0 = Release|x64 - {1B23F05D-FECA-1BAD-2235-047BCDC7409E}.Debug|Win32.ActiveCfg = Debug|Win32 - {1B23F05D-FECA-1BAD-2235-047BCDC7409E}.Debug|Win32.Build.0 = Debug|Win32 - {1B23F05D-FECA-1BAD-2235-047BCDC7409E}.Debug|x64.ActiveCfg = Debug|x64 - {1B23F05D-FECA-1BAD-2235-047BCDC7409E}.Debug|x64.Build.0 = Debug|x64 - {1B23F05D-FECA-1BAD-2235-047BCDC7409E}.Release|Win32.ActiveCfg = Release|Win32 - {1B23F05D-FECA-1BAD-2235-047BCDC7409E}.Release|Win32.Build.0 = Release|Win32 - {1B23F05D-FECA-1BAD-2235-047BCDC7409E}.Release|x64.ActiveCfg = Release|x64 - {1B23F05D-FECA-1BAD-2235-047BCDC7409E}.Release|x64.Build.0 = Release|x64 - {4A809018-FECA-1BAD-2235-047BCDC7409E}.Debug|Win32.ActiveCfg = Debug|Win32 - {4A809018-FECA-1BAD-2235-047BCDC7409E}.Debug|Win32.Build.0 = Debug|Win32 - {4A809018-FECA-1BAD-2235-047BCDC7409E}.Debug|x64.ActiveCfg = Debug|x64 - {4A809018-FECA-1BAD-2235-047BCDC7409E}.Debug|x64.Build.0 = Debug|x64 - {4A809018-FECA-1BAD-2235-047BCDC7409E}.Release|Win32.ActiveCfg = Release|Win32 - {4A809018-FECA-1BAD-2235-047BCDC7409E}.Release|Win32.Build.0 = Release|Win32 - {4A809018-FECA-1BAD-2235-047BCDC7409E}.Release|x64.ActiveCfg = Release|x64 - {4A809018-FECA-1BAD-2235-047BCDC7409E}.Release|x64.Build.0 = Release|x64 - {1F2066BE-FECA-1BAD-2235-047BCDC7409E}.Debug|Win32.ActiveCfg = Debug|Win32 - {1F2066BE-FECA-1BAD-2235-047BCDC7409E}.Debug|Win32.Build.0 = Debug|Win32 - {1F2066BE-FECA-1BAD-2235-047BCDC7409E}.Debug|x64.ActiveCfg = Debug|x64 - {1F2066BE-FECA-1BAD-2235-047BCDC7409E}.Debug|x64.Build.0 = Debug|x64 - {1F2066BE-FECA-1BAD-2235-047BCDC7409E}.Release|Win32.ActiveCfg = Release|Win32 - {1F2066BE-FECA-1BAD-2235-047BCDC7409E}.Release|Win32.Build.0 = Release|Win32 - {1F2066BE-FECA-1BAD-2235-047BCDC7409E}.Release|x64.ActiveCfg = Release|x64 - {1F2066BE-FECA-1BAD-2235-047BCDC7409E}.Release|x64.Build.0 = Release|x64 - {AE773E7F-FECA-1BAD-2235-047BCDC7409E}.Debug|Win32.ActiveCfg = Debug|Win32 - {AE773E7F-FECA-1BAD-2235-047BCDC7409E}.Debug|Win32.Build.0 = Debug|Win32 - {AE773E7F-FECA-1BAD-2235-047BCDC7409E}.Debug|x64.ActiveCfg = Debug|x64 - {AE773E7F-FECA-1BAD-2235-047BCDC7409E}.Debug|x64.Build.0 = Debug|x64 - {AE773E7F-FECA-1BAD-2235-047BCDC7409E}.Release|Win32.ActiveCfg = Release|Win32 - {AE773E7F-FECA-1BAD-2235-047BCDC7409E}.Release|Win32.Build.0 = Release|Win32 - {AE773E7F-FECA-1BAD-2235-047BCDC7409E}.Release|x64.ActiveCfg = Release|x64 - {AE773E7F-FECA-1BAD-2235-047BCDC7409E}.Release|x64.Build.0 = Release|x64 - {7D314A98-FECA-1BAD-2235-047BCDC7409E}.Debug|Win32.ActiveCfg = Debug|Win32 - {7D314A98-FECA-1BAD-2235-047BCDC7409E}.Debug|Win32.Build.0 = Debug|Win32 - {7D314A98-FECA-1BAD-2235-047BCDC7409E}.Debug|x64.ActiveCfg = Debug|x64 - {7D314A98-FECA-1BAD-2235-047BCDC7409E}.Debug|x64.Build.0 = Debug|x64 - {7D314A98-FECA-1BAD-2235-047BCDC7409E}.Release|Win32.ActiveCfg = Release|Win32 - {7D314A98-FECA-1BAD-2235-047BCDC7409E}.Release|Win32.Build.0 = Release|Win32 - {7D314A98-FECA-1BAD-2235-047BCDC7409E}.Release|x64.ActiveCfg = Release|x64 - {7D314A98-FECA-1BAD-2235-047BCDC7409E}.Release|x64.Build.0 = Release|x64 - {09714CB8-FECA-1BAD-2235-047BCDC7409E}.Debug|Win32.ActiveCfg = Debug|Win32 - {09714CB8-FECA-1BAD-2235-047BCDC7409E}.Debug|Win32.Build.0 = Debug|Win32 - {09714CB8-FECA-1BAD-2235-047BCDC7409E}.Debug|x64.ActiveCfg = Debug|x64 - {09714CB8-FECA-1BAD-2235-047BCDC7409E}.Debug|x64.Build.0 = Debug|x64 - {09714CB8-FECA-1BAD-2235-047BCDC7409E}.Release|Win32.ActiveCfg = Release|Win32 - {09714CB8-FECA-1BAD-2235-047BCDC7409E}.Release|Win32.Build.0 = Release|Win32 - {09714CB8-FECA-1BAD-2235-047BCDC7409E}.Release|x64.ActiveCfg = Release|x64 - {09714CB8-FECA-1BAD-2235-047BCDC7409E}.Release|x64.Build.0 = Release|x64 - {37AB26B9-FECA-1BAD-2235-047BCDC7409E}.Debug|Win32.ActiveCfg = Debug|Win32 - {37AB26B9-FECA-1BAD-2235-047BCDC7409E}.Debug|Win32.Build.0 = Debug|Win32 - {37AB26B9-FECA-1BAD-2235-047BCDC7409E}.Debug|x64.ActiveCfg = Debug|x64 - {37AB26B9-FECA-1BAD-2235-047BCDC7409E}.Debug|x64.Build.0 = Debug|x64 - {37AB26B9-FECA-1BAD-2235-047BCDC7409E}.Release|Win32.ActiveCfg = Release|Win32 - {37AB26B9-FECA-1BAD-2235-047BCDC7409E}.Release|Win32.Build.0 = Release|Win32 - {37AB26B9-FECA-1BAD-2235-047BCDC7409E}.Release|x64.ActiveCfg = Release|x64 - {37AB26B9-FECA-1BAD-2235-047BCDC7409E}.Release|x64.Build.0 = Release|x64 - {9392D1EE-FECA-1BAD-2235-047BCDC7409E}.Debug|Win32.ActiveCfg = Debug|Win32 - {9392D1EE-FECA-1BAD-2235-047BCDC7409E}.Debug|Win32.Build.0 = Debug|Win32 - {9392D1EE-FECA-1BAD-2235-047BCDC7409E}.Debug|x64.ActiveCfg = Debug|x64 - {9392D1EE-FECA-1BAD-2235-047BCDC7409E}.Debug|x64.Build.0 = Debug|x64 - {9392D1EE-FECA-1BAD-2235-047BCDC7409E}.Release|Win32.ActiveCfg = Release|Win32 - {9392D1EE-FECA-1BAD-2235-047BCDC7409E}.Release|Win32.Build.0 = Release|Win32 - {9392D1EE-FECA-1BAD-2235-047BCDC7409E}.Release|x64.ActiveCfg = Release|x64 - {9392D1EE-FECA-1BAD-2235-047BCDC7409E}.Release|x64.Build.0 = Release|x64 - {7D66FE10-FECA-1BAD-2235-047BCDC7409E}.Debug|Win32.ActiveCfg = Debug|Win32 - {7D66FE10-FECA-1BAD-2235-047BCDC7409E}.Debug|Win32.Build.0 = Debug|Win32 - {7D66FE10-FECA-1BAD-2235-047BCDC7409E}.Debug|x64.ActiveCfg = Debug|x64 - {7D66FE10-FECA-1BAD-2235-047BCDC7409E}.Debug|x64.Build.0 = Debug|x64 - {7D66FE10-FECA-1BAD-2235-047BCDC7409E}.Release|Win32.ActiveCfg = Release|Win32 - {7D66FE10-FECA-1BAD-2235-047BCDC7409E}.Release|Win32.Build.0 = Release|Win32 - {7D66FE10-FECA-1BAD-2235-047BCDC7409E}.Release|x64.ActiveCfg = Release|x64 - {7D66FE10-FECA-1BAD-2235-047BCDC7409E}.Release|x64.Build.0 = Release|x64 - {09034A53-FECA-1BAD-2235-047BCDC7409E}.Debug|Win32.ActiveCfg = Debug|Win32 - {09034A53-FECA-1BAD-2235-047BCDC7409E}.Debug|Win32.Build.0 = Debug|Win32 - {09034A53-FECA-1BAD-2235-047BCDC7409E}.Debug|x64.ActiveCfg = Debug|x64 - {09034A53-FECA-1BAD-2235-047BCDC7409E}.Debug|x64.Build.0 = Debug|x64 - {09034A53-FECA-1BAD-2235-047BCDC7409E}.Release|Win32.ActiveCfg = Release|Win32 - {09034A53-FECA-1BAD-2235-047BCDC7409E}.Release|Win32.Build.0 = Release|Win32 - {09034A53-FECA-1BAD-2235-047BCDC7409E}.Release|x64.ActiveCfg = Release|x64 - {09034A53-FECA-1BAD-2235-047BCDC7409E}.Release|x64.Build.0 = Release|x64 - {6E3B2A6B-FECA-1BAD-2235-047BCDC7409E}.Debug|Win32.ActiveCfg = Debug|Win32 - {6E3B2A6B-FECA-1BAD-2235-047BCDC7409E}.Debug|Win32.Build.0 = Debug|Win32 - {6E3B2A6B-FECA-1BAD-2235-047BCDC7409E}.Debug|x64.ActiveCfg = Debug|x64 - {6E3B2A6B-FECA-1BAD-2235-047BCDC7409E}.Debug|x64.Build.0 = Debug|x64 - {6E3B2A6B-FECA-1BAD-2235-047BCDC7409E}.Release|Win32.ActiveCfg = Release|Win32 - {6E3B2A6B-FECA-1BAD-2235-047BCDC7409E}.Release|Win32.Build.0 = Release|Win32 - {6E3B2A6B-FECA-1BAD-2235-047BCDC7409E}.Release|x64.ActiveCfg = Release|x64 - {6E3B2A6B-FECA-1BAD-2235-047BCDC7409E}.Release|x64.Build.0 = Release|x64 - {697786BE-FECA-1BAD-2235-047BCDC7409E}.Debug|Win32.ActiveCfg = Debug|Win32 - {697786BE-FECA-1BAD-2235-047BCDC7409E}.Debug|Win32.Build.0 = Debug|Win32 - {697786BE-FECA-1BAD-2235-047BCDC7409E}.Debug|x64.ActiveCfg = Debug|x64 - {697786BE-FECA-1BAD-2235-047BCDC7409E}.Debug|x64.Build.0 = Debug|x64 - {697786BE-FECA-1BAD-2235-047BCDC7409E}.Release|Win32.ActiveCfg = Release|Win32 - {697786BE-FECA-1BAD-2235-047BCDC7409E}.Release|Win32.Build.0 = Release|Win32 - {697786BE-FECA-1BAD-2235-047BCDC7409E}.Release|x64.ActiveCfg = Release|x64 - {697786BE-FECA-1BAD-2235-047BCDC7409E}.Release|x64.Build.0 = Release|x64 - {51E5F6B9-FECA-1BAD-2235-047BCDC7409E}.Debug|Win32.ActiveCfg = Debug|Win32 - {51E5F6B9-FECA-1BAD-2235-047BCDC7409E}.Debug|Win32.Build.0 = Debug|Win32 - {51E5F6B9-FECA-1BAD-2235-047BCDC7409E}.Debug|x64.ActiveCfg = Debug|x64 - {51E5F6B9-FECA-1BAD-2235-047BCDC7409E}.Debug|x64.Build.0 = Debug|x64 - {51E5F6B9-FECA-1BAD-2235-047BCDC7409E}.Release|Win32.ActiveCfg = Release|Win32 - {51E5F6B9-FECA-1BAD-2235-047BCDC7409E}.Release|Win32.Build.0 = Release|Win32 - {51E5F6B9-FECA-1BAD-2235-047BCDC7409E}.Release|x64.ActiveCfg = Release|x64 - {51E5F6B9-FECA-1BAD-2235-047BCDC7409E}.Release|x64.Build.0 = Release|x64 + {9A95F0E4-FECA-1BAD-2431-8A11DB0D67CE}.Debug|Win32.ActiveCfg = Debug|Win32 + {9A95F0E4-FECA-1BAD-2431-8A11DB0D67CE}.Debug|Win32.Build.0 = Debug|Win32 + {9A95F0E4-FECA-1BAD-2431-8A11DB0D67CE}.Debug|x64.ActiveCfg = Debug|x64 + {9A95F0E4-FECA-1BAD-2431-8A11DB0D67CE}.Debug|x64.Build.0 = Debug|x64 + {9A95F0E4-FECA-1BAD-2431-8A11DB0D67CE}.Release|Win32.ActiveCfg = Release|Win32 + {9A95F0E4-FECA-1BAD-2431-8A11DB0D67CE}.Release|Win32.Build.0 = Release|Win32 + {9A95F0E4-FECA-1BAD-2431-8A11DB0D67CE}.Release|x64.ActiveCfg = Release|x64 + {9A95F0E4-FECA-1BAD-2431-8A11DB0D67CE}.Release|x64.Build.0 = Release|x64 + {7F5DE0A1-FECA-1BAD-2431-8A11DB0D67CE}.Debug|Win32.ActiveCfg = Debug|Win32 + {7F5DE0A1-FECA-1BAD-2431-8A11DB0D67CE}.Debug|Win32.Build.0 = Debug|Win32 + {7F5DE0A1-FECA-1BAD-2431-8A11DB0D67CE}.Debug|x64.ActiveCfg = Debug|x64 + {7F5DE0A1-FECA-1BAD-2431-8A11DB0D67CE}.Debug|x64.Build.0 = Debug|x64 + {7F5DE0A1-FECA-1BAD-2431-8A11DB0D67CE}.Release|Win32.ActiveCfg = Release|Win32 + {7F5DE0A1-FECA-1BAD-2431-8A11DB0D67CE}.Release|Win32.Build.0 = Release|Win32 + {7F5DE0A1-FECA-1BAD-2431-8A11DB0D67CE}.Release|x64.ActiveCfg = Release|x64 + {7F5DE0A1-FECA-1BAD-2431-8A11DB0D67CE}.Release|x64.Build.0 = Release|x64 + {0A5AF6BE-FECA-1BAD-2431-8A11DB0D67CE}.Debug|Win32.ActiveCfg = Debug|Win32 + {0A5AF6BE-FECA-1BAD-2431-8A11DB0D67CE}.Debug|Win32.Build.0 = Debug|Win32 + {0A5AF6BE-FECA-1BAD-2431-8A11DB0D67CE}.Debug|x64.ActiveCfg = Debug|x64 + {0A5AF6BE-FECA-1BAD-2431-8A11DB0D67CE}.Debug|x64.Build.0 = Debug|x64 + {0A5AF6BE-FECA-1BAD-2431-8A11DB0D67CE}.Release|Win32.ActiveCfg = Release|Win32 + {0A5AF6BE-FECA-1BAD-2431-8A11DB0D67CE}.Release|Win32.Build.0 = Release|Win32 + {0A5AF6BE-FECA-1BAD-2431-8A11DB0D67CE}.Release|x64.ActiveCfg = Release|x64 + {0A5AF6BE-FECA-1BAD-2431-8A11DB0D67CE}.Release|x64.Build.0 = Release|x64 + {1B23F05D-FECA-1BAD-2431-8A11DB0D67CE}.Debug|Win32.ActiveCfg = Debug|Win32 + {1B23F05D-FECA-1BAD-2431-8A11DB0D67CE}.Debug|Win32.Build.0 = Debug|Win32 + {1B23F05D-FECA-1BAD-2431-8A11DB0D67CE}.Debug|x64.ActiveCfg = Debug|x64 + {1B23F05D-FECA-1BAD-2431-8A11DB0D67CE}.Debug|x64.Build.0 = Debug|x64 + {1B23F05D-FECA-1BAD-2431-8A11DB0D67CE}.Release|Win32.ActiveCfg = Release|Win32 + {1B23F05D-FECA-1BAD-2431-8A11DB0D67CE}.Release|Win32.Build.0 = Release|Win32 + {1B23F05D-FECA-1BAD-2431-8A11DB0D67CE}.Release|x64.ActiveCfg = Release|x64 + {1B23F05D-FECA-1BAD-2431-8A11DB0D67CE}.Release|x64.Build.0 = Release|x64 + {4A809018-FECA-1BAD-2431-8A11DB0D67CE}.Debug|Win32.ActiveCfg = Debug|Win32 + {4A809018-FECA-1BAD-2431-8A11DB0D67CE}.Debug|Win32.Build.0 = Debug|Win32 + {4A809018-FECA-1BAD-2431-8A11DB0D67CE}.Debug|x64.ActiveCfg = Debug|x64 + {4A809018-FECA-1BAD-2431-8A11DB0D67CE}.Debug|x64.Build.0 = Debug|x64 + {4A809018-FECA-1BAD-2431-8A11DB0D67CE}.Release|Win32.ActiveCfg = Release|Win32 + {4A809018-FECA-1BAD-2431-8A11DB0D67CE}.Release|Win32.Build.0 = Release|Win32 + {4A809018-FECA-1BAD-2431-8A11DB0D67CE}.Release|x64.ActiveCfg = Release|x64 + {4A809018-FECA-1BAD-2431-8A11DB0D67CE}.Release|x64.Build.0 = Release|x64 + {1F2066BE-FECA-1BAD-2431-8A11DB0D67CE}.Debug|Win32.ActiveCfg = Debug|Win32 + {1F2066BE-FECA-1BAD-2431-8A11DB0D67CE}.Debug|Win32.Build.0 = Debug|Win32 + {1F2066BE-FECA-1BAD-2431-8A11DB0D67CE}.Debug|x64.ActiveCfg = Debug|x64 + {1F2066BE-FECA-1BAD-2431-8A11DB0D67CE}.Debug|x64.Build.0 = Debug|x64 + {1F2066BE-FECA-1BAD-2431-8A11DB0D67CE}.Release|Win32.ActiveCfg = Release|Win32 + {1F2066BE-FECA-1BAD-2431-8A11DB0D67CE}.Release|Win32.Build.0 = Release|Win32 + {1F2066BE-FECA-1BAD-2431-8A11DB0D67CE}.Release|x64.ActiveCfg = Release|x64 + {1F2066BE-FECA-1BAD-2431-8A11DB0D67CE}.Release|x64.Build.0 = Release|x64 + {AE773E7F-FECA-1BAD-2431-8A11DB0D67CE}.Debug|Win32.ActiveCfg = Debug|Win32 + {AE773E7F-FECA-1BAD-2431-8A11DB0D67CE}.Debug|Win32.Build.0 = Debug|Win32 + {AE773E7F-FECA-1BAD-2431-8A11DB0D67CE}.Debug|x64.ActiveCfg = Debug|x64 + {AE773E7F-FECA-1BAD-2431-8A11DB0D67CE}.Debug|x64.Build.0 = Debug|x64 + {AE773E7F-FECA-1BAD-2431-8A11DB0D67CE}.Release|Win32.ActiveCfg = Release|Win32 + {AE773E7F-FECA-1BAD-2431-8A11DB0D67CE}.Release|Win32.Build.0 = Release|Win32 + {AE773E7F-FECA-1BAD-2431-8A11DB0D67CE}.Release|x64.ActiveCfg = Release|x64 + {AE773E7F-FECA-1BAD-2431-8A11DB0D67CE}.Release|x64.Build.0 = Release|x64 + {7D314A98-FECA-1BAD-2431-8A11DB0D67CE}.Debug|Win32.ActiveCfg = Debug|Win32 + {7D314A98-FECA-1BAD-2431-8A11DB0D67CE}.Debug|Win32.Build.0 = Debug|Win32 + {7D314A98-FECA-1BAD-2431-8A11DB0D67CE}.Debug|x64.ActiveCfg = Debug|x64 + {7D314A98-FECA-1BAD-2431-8A11DB0D67CE}.Debug|x64.Build.0 = Debug|x64 + {7D314A98-FECA-1BAD-2431-8A11DB0D67CE}.Release|Win32.ActiveCfg = Release|Win32 + {7D314A98-FECA-1BAD-2431-8A11DB0D67CE}.Release|Win32.Build.0 = Release|Win32 + {7D314A98-FECA-1BAD-2431-8A11DB0D67CE}.Release|x64.ActiveCfg = Release|x64 + {7D314A98-FECA-1BAD-2431-8A11DB0D67CE}.Release|x64.Build.0 = Release|x64 + {09714CB8-FECA-1BAD-2431-8A11DB0D67CE}.Debug|Win32.ActiveCfg = Debug|Win32 + {09714CB8-FECA-1BAD-2431-8A11DB0D67CE}.Debug|Win32.Build.0 = Debug|Win32 + {09714CB8-FECA-1BAD-2431-8A11DB0D67CE}.Debug|x64.ActiveCfg = Debug|x64 + {09714CB8-FECA-1BAD-2431-8A11DB0D67CE}.Debug|x64.Build.0 = Debug|x64 + {09714CB8-FECA-1BAD-2431-8A11DB0D67CE}.Release|Win32.ActiveCfg = Release|Win32 + {09714CB8-FECA-1BAD-2431-8A11DB0D67CE}.Release|Win32.Build.0 = Release|Win32 + {09714CB8-FECA-1BAD-2431-8A11DB0D67CE}.Release|x64.ActiveCfg = Release|x64 + {09714CB8-FECA-1BAD-2431-8A11DB0D67CE}.Release|x64.Build.0 = Release|x64 + {37AB26B9-FECA-1BAD-2431-8A11DB0D67CE}.Debug|Win32.ActiveCfg = Debug|Win32 + {37AB26B9-FECA-1BAD-2431-8A11DB0D67CE}.Debug|Win32.Build.0 = Debug|Win32 + {37AB26B9-FECA-1BAD-2431-8A11DB0D67CE}.Debug|x64.ActiveCfg = Debug|x64 + {37AB26B9-FECA-1BAD-2431-8A11DB0D67CE}.Debug|x64.Build.0 = Debug|x64 + {37AB26B9-FECA-1BAD-2431-8A11DB0D67CE}.Release|Win32.ActiveCfg = Release|Win32 + {37AB26B9-FECA-1BAD-2431-8A11DB0D67CE}.Release|Win32.Build.0 = Release|Win32 + {37AB26B9-FECA-1BAD-2431-8A11DB0D67CE}.Release|x64.ActiveCfg = Release|x64 + {37AB26B9-FECA-1BAD-2431-8A11DB0D67CE}.Release|x64.Build.0 = Release|x64 + {9392D1EE-FECA-1BAD-2431-8A11DB0D67CE}.Debug|Win32.ActiveCfg = Debug|Win32 + {9392D1EE-FECA-1BAD-2431-8A11DB0D67CE}.Debug|Win32.Build.0 = Debug|Win32 + {9392D1EE-FECA-1BAD-2431-8A11DB0D67CE}.Debug|x64.ActiveCfg = Debug|x64 + {9392D1EE-FECA-1BAD-2431-8A11DB0D67CE}.Debug|x64.Build.0 = Debug|x64 + {9392D1EE-FECA-1BAD-2431-8A11DB0D67CE}.Release|Win32.ActiveCfg = Release|Win32 + {9392D1EE-FECA-1BAD-2431-8A11DB0D67CE}.Release|Win32.Build.0 = Release|Win32 + {9392D1EE-FECA-1BAD-2431-8A11DB0D67CE}.Release|x64.ActiveCfg = Release|x64 + {9392D1EE-FECA-1BAD-2431-8A11DB0D67CE}.Release|x64.Build.0 = Release|x64 + {7D66FE10-FECA-1BAD-2431-8A11DB0D67CE}.Debug|Win32.ActiveCfg = Debug|Win32 + {7D66FE10-FECA-1BAD-2431-8A11DB0D67CE}.Debug|Win32.Build.0 = Debug|Win32 + {7D66FE10-FECA-1BAD-2431-8A11DB0D67CE}.Debug|x64.ActiveCfg = Debug|x64 + {7D66FE10-FECA-1BAD-2431-8A11DB0D67CE}.Debug|x64.Build.0 = Debug|x64 + {7D66FE10-FECA-1BAD-2431-8A11DB0D67CE}.Release|Win32.ActiveCfg = Release|Win32 + {7D66FE10-FECA-1BAD-2431-8A11DB0D67CE}.Release|Win32.Build.0 = Release|Win32 + {7D66FE10-FECA-1BAD-2431-8A11DB0D67CE}.Release|x64.ActiveCfg = Release|x64 + {7D66FE10-FECA-1BAD-2431-8A11DB0D67CE}.Release|x64.Build.0 = Release|x64 + {09034A53-FECA-1BAD-2431-8A11DB0D67CE}.Debug|Win32.ActiveCfg = Debug|Win32 + {09034A53-FECA-1BAD-2431-8A11DB0D67CE}.Debug|Win32.Build.0 = Debug|Win32 + {09034A53-FECA-1BAD-2431-8A11DB0D67CE}.Debug|x64.ActiveCfg = Debug|x64 + {09034A53-FECA-1BAD-2431-8A11DB0D67CE}.Debug|x64.Build.0 = Debug|x64 + {09034A53-FECA-1BAD-2431-8A11DB0D67CE}.Release|Win32.ActiveCfg = Release|Win32 + {09034A53-FECA-1BAD-2431-8A11DB0D67CE}.Release|Win32.Build.0 = Release|Win32 + {09034A53-FECA-1BAD-2431-8A11DB0D67CE}.Release|x64.ActiveCfg = Release|x64 + {09034A53-FECA-1BAD-2431-8A11DB0D67CE}.Release|x64.Build.0 = Release|x64 + {6E3B2A6B-FECA-1BAD-2431-8A11DB0D67CE}.Debug|Win32.ActiveCfg = Debug|Win32 + {6E3B2A6B-FECA-1BAD-2431-8A11DB0D67CE}.Debug|Win32.Build.0 = Debug|Win32 + {6E3B2A6B-FECA-1BAD-2431-8A11DB0D67CE}.Debug|x64.ActiveCfg = Debug|x64 + {6E3B2A6B-FECA-1BAD-2431-8A11DB0D67CE}.Debug|x64.Build.0 = Debug|x64 + {6E3B2A6B-FECA-1BAD-2431-8A11DB0D67CE}.Release|Win32.ActiveCfg = Release|Win32 + {6E3B2A6B-FECA-1BAD-2431-8A11DB0D67CE}.Release|Win32.Build.0 = Release|Win32 + {6E3B2A6B-FECA-1BAD-2431-8A11DB0D67CE}.Release|x64.ActiveCfg = Release|x64 + {6E3B2A6B-FECA-1BAD-2431-8A11DB0D67CE}.Release|x64.Build.0 = Release|x64 + {697786BE-FECA-1BAD-2431-8A11DB0D67CE}.Debug|Win32.ActiveCfg = Debug|Win32 + {697786BE-FECA-1BAD-2431-8A11DB0D67CE}.Debug|Win32.Build.0 = Debug|Win32 + {697786BE-FECA-1BAD-2431-8A11DB0D67CE}.Debug|x64.ActiveCfg = Debug|x64 + {697786BE-FECA-1BAD-2431-8A11DB0D67CE}.Debug|x64.Build.0 = Debug|x64 + {697786BE-FECA-1BAD-2431-8A11DB0D67CE}.Release|Win32.ActiveCfg = Release|Win32 + {697786BE-FECA-1BAD-2431-8A11DB0D67CE}.Release|Win32.Build.0 = Release|Win32 + {697786BE-FECA-1BAD-2431-8A11DB0D67CE}.Release|x64.ActiveCfg = Release|x64 + {697786BE-FECA-1BAD-2431-8A11DB0D67CE}.Release|x64.Build.0 = Release|x64 + {51E5F6B9-FECA-1BAD-2431-8A11DB0D67CE}.Debug|Win32.ActiveCfg = Debug|Win32 + {51E5F6B9-FECA-1BAD-2431-8A11DB0D67CE}.Debug|Win32.Build.0 = Debug|Win32 + {51E5F6B9-FECA-1BAD-2431-8A11DB0D67CE}.Debug|x64.ActiveCfg = Debug|x64 + {51E5F6B9-FECA-1BAD-2431-8A11DB0D67CE}.Debug|x64.Build.0 = Debug|x64 + {51E5F6B9-FECA-1BAD-2431-8A11DB0D67CE}.Release|Win32.ActiveCfg = Release|Win32 + {51E5F6B9-FECA-1BAD-2431-8A11DB0D67CE}.Release|Win32.Build.0 = Release|Win32 + {51E5F6B9-FECA-1BAD-2431-8A11DB0D67CE}.Release|x64.ActiveCfg = Release|x64 + {51E5F6B9-FECA-1BAD-2431-8A11DB0D67CE}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/qpid/cpp/src/tests/topic_listener.cpp b/qpid/cpp/src/tests/topic_listener.cpp index 7bdc2c32de..1f0b3f5377 100644 --- a/qpid/cpp/src/tests/topic_listener.cpp +++ b/qpid/cpp/src/tests/topic_listener.cpp @@ -37,6 +37,7 @@ #include "qpid/client/MessageListener.h" #include "qpid/client/Session.h" #include "qpid/client/SubscriptionManager.h" +#include "qpid/sys/SystemInfo.h" #include "qpid/sys/Time.h" #include "qpid/framing/FieldValue.h" #include @@ -132,7 +133,7 @@ int main(int argc, char** argv){ if( args.statusqueue.length() > 0 ) { stringstream msg_str; - msg_str << "topic_listener: " << (int)getpid(); + msg_str << "topic_listener: " << qpid::sys::SystemInfo::getProcessId(); session.messageTransfer(arg::content=Message(msg_str.str(), args.statusqueue)); cout << "Ready status put on queue '" << args.statusqueue << "'" << endl; } diff --git a/qpid/cpp/src/tests/topic_listener.vcproj b/qpid/cpp/src/tests/topic_listener.vcproj index eedfe14687..0be31b8348 100644 --- a/qpid/cpp/src/tests/topic_listener.vcproj +++ b/qpid/cpp/src/tests/topic_listener.vcproj @@ -3,7 +3,7 @@ ProjectType="Visual C++" Version="9.00" Name="topic_listener" - ProjectGUID="{9392D1EE-FECA-1BAD-2235-047BCDC7409E}" + ProjectGUID="{9392D1EE-FECA-1BAD-2431-8A11DB0D67CE}" RootNamespace="topic_listener" Keyword="Win32Proj" SignManifests="true" @@ -21,8 +21,8 @@ @@ -76,7 +76,7 @@ /> @@ -155,7 +155,7 @@ /> @@ -240,7 +240,7 @@ @@ -320,7 +320,7 @@ + + + + + + + + + + + + @@ -378,9 +396,15 @@ + + + + @@ -393,6 +417,15 @@ + + + + + + @@ -402,6 +435,15 @@ + + + + + + @@ -429,6 +471,18 @@ + + + + + + + + -- cgit v1.2.1