Author: astitcher
Date: Sun May 3 03:52:37 2009
New Revision: 771020
URL: http://svn.apache.org/viewvc?rev=771020&view=rev
Log:
Some more fixes to build under Visual Studio 2008
Remove some simple Visual Studio 2008 warnings
Fix qmfconsole build under Windows and CMake
Modified:
qpid/trunk/qpid/cpp/src/qpid/Plugin.h
qpid/trunk/qpid/cpp/src/qpid/acl/Acl.cpp
qpid/trunk/qpid/cpp/src/qpid/broker/DeliveryRecord.h
qpid/trunk/qpid/cpp/src/qpid/broker/Exchange.h
qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeRegistry.h
qpid/trunk/qpid/cpp/src/qpid/broker/Message.h
qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h
qpid/trunk/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.cpp
qpid/trunk/qpid/cpp/src/qpid/client/Connector.cpp
qpid/trunk/qpid/cpp/src/qpid/console/ConsoleImportExport.h
qpid/trunk/qpid/cpp/src/tests/FieldTable.cpp
qpid/trunk/qpid/cpp/src/tests/header_test.cpp
Modified: qpid/trunk/qpid/cpp/src/qpid/Plugin.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/Plugin.h?rev=771020&r1=771019&r2=771020&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/Plugin.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/Plugin.h Sun May 3 03:52:37 2009
@@ -53,7 +53,7 @@
QPID_COMMON_EXTERN void finalize();
/** Add a function to run when finalize() is called */
- void addFinalizer(const boost::function<void()>&);
+ QPID_COMMON_EXTERN void addFinalizer(const boost::function<void()>&);
private:
std::vector<boost::function<void()> > finalizers;
Modified: qpid/trunk/qpid/cpp/src/qpid/acl/Acl.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/acl/Acl.cpp?rev=771020&r1=771019&r2=771020&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/acl/Acl.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/acl/Acl.cpp Sun May 3 03:52:37 2009
@@ -36,13 +36,14 @@
using namespace std;
using namespace qpid::acl;
+using qpid::broker::Broker;
using qpid::management::ManagementAgent;
using qpid::management::ManagementObject;
using qpid::management::Manageable;
using qpid::management::Args;
namespace _qmf = qmf::org::apache::qpid::acl;
-Acl::Acl (AclValues& av, broker::Broker& b): aclValues(av), broker(&b),
transferAcl(false)
+Acl::Acl (AclValues& av, Broker& b): aclValues(av), broker(&b),
transferAcl(false)
{
agent = ManagementAgent::Singleton::getInstance();
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/DeliveryRecord.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/DeliveryRecord.h?rev=771020&r1=771019&r2=771020&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/DeliveryRecord.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/DeliveryRecord.h Sun May 3 03:52:37
2009
@@ -35,17 +35,7 @@
namespace qpid {
namespace broker {
class SemanticState;
-class DeliveryRecord;
-
-typedef std::deque<DeliveryRecord> DeliveryRecords;
-
-struct AckRange
-{
- DeliveryRecords::iterator start;
- DeliveryRecords::iterator end;
- AckRange(DeliveryRecords::iterator _start, DeliveryRecords::iterator _end)
: start(_start), end(_end) {}
-};
-
+struct AckRange;
/**
* Record of a delivery for which an ack is outstanding.
@@ -113,6 +103,7 @@
void deliver(framing::FrameHandler& h, DeliveryId deliveryId, uint16_t
framesize);
void setId(DeliveryId _id) { id = _id; }
+ typedef std::deque<DeliveryRecord> DeliveryRecords;
static AckRange findRange(DeliveryRecords& records, DeliveryId first,
DeliveryId last);
const QueuedMessage& getMessage() const { return msg; }
framing::SequenceNumber getId() const { return id; }
@@ -132,6 +123,16 @@
record.acquire(results);
}
};
+
+typedef DeliveryRecord::DeliveryRecords DeliveryRecords;
+
+struct AckRange
+{
+ DeliveryRecords::iterator start;
+ DeliveryRecords::iterator end;
+ AckRange(DeliveryRecords::iterator _start, DeliveryRecords::iterator _end)
: start(_start), end(_end) {}
+};
+
}
}
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Exchange.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Exchange.h?rev=771020&r1=771019&r2=771020&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Exchange.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Exchange.h Sun May 3 03:52:37 2009
@@ -121,9 +121,9 @@
public:
typedef boost::shared_ptr<Exchange> shared_ptr;
- explicit Exchange(const std::string& name, management::Manageable* parent
= 0);
- Exchange(const std::string& _name, bool _durable, const
qpid::framing::FieldTable& _args,
- management::Manageable* parent = 0);
+ QPID_BROKER_EXTERN explicit Exchange(const std::string& name,
management::Manageable* parent = 0);
+ QPID_BROKER_EXTERN Exchange(const std::string& _name, bool _durable, const
qpid::framing::FieldTable& _args,
+ management::Manageable* parent = 0);
QPID_BROKER_EXTERN virtual ~Exchange();
const std::string& getName() const { return name; }
@@ -140,19 +140,19 @@
virtual bool bind(Queue::shared_ptr queue, const std::string& routingKey,
const qpid::framing::FieldTable* args) = 0;
virtual bool unbind(Queue::shared_ptr queue, const std::string&
routingKey, const qpid::framing::FieldTable* args) = 0;
virtual bool isBound(Queue::shared_ptr queue, const std::string* const
routingKey, const qpid::framing::FieldTable* const args) = 0;
- virtual void setProperties(const boost::intrusive_ptr<Message>&);
+ QPID_BROKER_EXTERN virtual void setProperties(const
boost::intrusive_ptr<Message>&);
virtual void route(Deliverable& msg, const std::string& routingKey, const
qpid::framing::FieldTable* args) = 0;
//PersistableExchange:
- void setPersistenceId(uint64_t id) const;
+ QPID_BROKER_EXTERN void setPersistenceId(uint64_t id) const;
uint64_t getPersistenceId() const { return persistenceId; }
- uint32_t encodedSize() const;
+ QPID_BROKER_EXTERN uint32_t encodedSize() const;
QPID_BROKER_EXTERN virtual void encode(framing::Buffer& buffer) const;
static QPID_BROKER_EXTERN Exchange::shared_ptr decode(ExchangeRegistry&
exchanges, framing::Buffer& buffer);
// Manageable entry points
- management::ManagementObject* GetManagementObject(void) const;
+ QPID_BROKER_EXTERN management::ManagementObject* GetManagementObject(void)
const;
// Federation hooks
class DynamicBridge {
@@ -172,7 +172,7 @@
qpid::sys::Mutex bridgeLock;
std::vector<DynamicBridge*> bridgeVector;
- virtual void handleHelloRequest();
+ QPID_BROKER_EXTERN virtual void handleHelloRequest();
void propagateFedOp(const std::string& routingKey, const std::string& tags,
const std::string& op, const std::string&
origin);
};
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeRegistry.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeRegistry.h?rev=771020&r1=771019&r2=771020&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeRegistry.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/ExchangeRegistry.h Sun May 3 03:52:37
2009
@@ -47,14 +47,12 @@
ExchangeRegistry () : parent(0) {}
QPID_BROKER_EXTERN std::pair<Exchange::shared_ptr, bool> declare
- (const std::string& name, const std::string& type)
- throw(UnknownExchangeTypeException);
+ (const std::string& name, const std::string& type);
QPID_BROKER_EXTERN std::pair<Exchange::shared_ptr, bool> declare
(const std::string& name,
const std::string& type,
bool durable,
- const qpid::framing::FieldTable& args = framing::FieldTable())
- throw(UnknownExchangeTypeException);
+ const qpid::framing::FieldTable& args = framing::FieldTable());
QPID_BROKER_EXTERN void destroy(const std::string& name);
QPID_BROKER_EXTERN Exchange::shared_ptr get(const std::string& name);
Exchange::shared_ptr getDefault();
@@ -69,7 +67,7 @@
*/
bool registerExchange(const Exchange::shared_ptr&);
- void registerType(const std::string& type, FactoryFunction);
+ QPID_BROKER_EXTERN void registerType(const std::string& type,
FactoryFunction);
/** Call f for each exchange in the registry. */
template <class F> void eachExchange(F f) const {
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=771020&r1=771019&r2=771020&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Message.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Message.h Sun May 3 03:52:37 2009
@@ -138,7 +138,7 @@
void destroy();
bool getContentFrame(const Queue& queue, framing::AMQFrame& frame,
uint16_t maxContentSize, uint64_t offset) const;
- void sendContent(const Queue& queue, framing::FrameHandler& out, uint16_t
maxFrameSize) const;
+ QPID_BROKER_EXTERN void sendContent(const Queue& queue,
framing::FrameHandler& out, uint16_t maxFrameSize) const;
void sendHeader(framing::FrameHandler& out, uint16_t maxFrameSize) const;
QPID_BROKER_EXTERN bool isContentLoaded() const;
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h?rev=771020&r1=771019&r2=771020&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Queue.h Sun May 3 03:52:37 2009
@@ -183,7 +183,7 @@
Queue::shared_ptr shared_ref);
QPID_BROKER_EXTERN bool acquire(const QueuedMessage& msg);
- bool acquireMessageAt(const qpid::framing::SequenceNumber&
position, QueuedMessage& message);
+ QPID_BROKER_EXTERN bool acquireMessageAt(const
qpid::framing::SequenceNumber& position, QueuedMessage& message);
/**
* Delivers a message to the queue. Will record it as
@@ -241,7 +241,7 @@
/**
* dequeue from store (only done once messages is acknowledged)
*/
- bool dequeue(TransactionContext* ctxt, const QueuedMessage &msg);
+ QPID_BROKER_EXTERN bool dequeue(TransactionContext* ctxt, const
QueuedMessage &msg);
/**
* Inform the queue that a previous transactional dequeue
* committed.
@@ -301,7 +301,7 @@
void setPosition(framing::SequenceNumber pos);
int getEventMode();
void setQueueEventManager(QueueEvents&);
- void insertSequenceNumbers(const std::string& key);
+ QPID_BROKER_EXTERN void insertSequenceNumbers(const std::string&
key);
/**
* Notify queue that recovery has completed.
*/
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.cpp?rev=771020&r1=771019&r2=771020&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/RecoveryManagerImpl.cpp Sun May 3
03:52:37 2009
@@ -28,11 +28,12 @@
#include "RecoveredDequeue.h"
#include "qpid/framing/reply_exceptions.h"
-using namespace qpid;
-using namespace qpid::broker;
using boost::dynamic_pointer_cast;
using boost::intrusive_ptr;
+namespace qpid {
+namespace broker {
+
RecoveryManagerImpl::RecoveryManagerImpl(QueueRegistry& _queues,
ExchangeRegistry& _exchanges, LinkRegistry& _links,
DtxManager& _dtxMgr, uint64_t
_stagingThreshold)
: queues(_queues), exchanges(_exchanges), links(_links), dtxMgr(_dtxMgr),
stagingThreshold(_stagingThreshold) {}
@@ -252,3 +253,5 @@
{
dynamic_pointer_cast<RecoverableQueueImpl>(queue)->enqueue(buffer,
message);
}
+
+}}
Modified: qpid/trunk/qpid/cpp/src/qpid/client/Connector.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/client/Connector.cpp?rev=771020&r1=771019&r2=771020&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/client/Connector.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/client/Connector.cpp Sun May 3 03:52:37 2009
@@ -397,7 +397,7 @@
}
try {
socket.close();
- } catch (const std::exception& e) {}
+ } catch (const std::exception&) {}
}
void
TCPConnector::activateSecurityLayer(std::auto_ptr<qpid::sys::SecurityLayer> sl)
Modified: qpid/trunk/qpid/cpp/src/qpid/console/ConsoleImportExport.h
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/console/ConsoleImportExport.h?rev=771020&r1=771019&r2=771020&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/console/ConsoleImportExport.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/console/ConsoleImportExport.h Sun May 3
03:52:37 2009
@@ -21,7 +21,7 @@
*/
#if defined(WIN32) && !defined(QPID_DECLARE_STATIC)
-#if defined(CONSOLE_EXPORT)
+#if defined(CONSOLE_EXPORT) || defined (qmfconsole_EXPORTS)
#define QPID_CONSOLE_EXTERN __declspec(dllexport)
#else
#define QPID_CONSOLE_EXTERN __declspec(dllimport)
Modified: qpid/trunk/qpid/cpp/src/tests/FieldTable.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/FieldTable.cpp?rev=771020&r1=771019&r2=771020&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/FieldTable.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/FieldTable.cpp Sun May 3 03:52:37 2009
@@ -125,7 +125,7 @@
QPID_AUTO_TEST_CASE(testFloatAndDouble)
{
char buff[100];
- float f = 5.672;
+ float f = 5.672f;
double d = 56.720001;
{
FieldTable a;
Modified: qpid/trunk/qpid/cpp/src/tests/header_test.cpp
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/header_test.cpp?rev=771020&r1=771019&r2=771020&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/tests/header_test.cpp (original)
+++ qpid/trunk/qpid/cpp/src/tests/header_test.cpp Sun May 3 03:52:37 2009
@@ -42,7 +42,7 @@
std::string q("header_interop_test_queue");
session.queueDeclare(arg::queue=q);
double pi = 3.14159265;
- float e = 2.71828;
+ float e = 2.71828f;
Message msg("", q);
msg.getMessageProperties().getApplicationHeaders().setDouble("pi", pi);
msg.getMessageProperties().getApplicationHeaders().setFloat("e", e);
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscr...@qpid.apache.org
