You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ch...@apache.org on 2012/12/03 23:00:26 UTC
svn commit: r1416692 - in /qpid/trunk/qpid/cpp:
managementgen/qmfgen/templates/Event.h src/qpid/broker/Broker.h
src/qpid/broker/QueueFlowLimit.h
Author: chug
Date: Mon Dec 3 22:00:24 2012
New Revision: 1416692
URL: http://svn.apache.org/viewvc?rev=1416692&view=rev
Log:
QPID-4449 Repair some windows settings damaged during this jira.
Modified:
qpid/trunk/qpid/cpp/managementgen/qmfgen/templates/Event.h
qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h
qpid/trunk/qpid/cpp/src/qpid/broker/QueueFlowLimit.h
Modified: qpid/trunk/qpid/cpp/managementgen/qmfgen/templates/Event.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/managementgen/qmfgen/templates/Event.h?rev=1416692&r1=1416691&r2=1416692&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/managementgen/qmfgen/templates/Event.h (original)
+++ qpid/trunk/qpid/cpp/managementgen/qmfgen/templates/Event.h Mon Dec 3 22:00:24 2012
@@ -36,8 +36,8 @@ namespace qmf {
private:
static void writeSchema (std::string& schema);
static uint8_t md5Sum[MD5_LEN];
- static std::string packageName;
- static std::string eventName;
+ /*MGEN:Root.ExternMethod*/ static std::string packageName;
+ /*MGEN:Root.ExternMethod*/ static std::string eventName;
/*MGEN:Event.ArgDeclarations*/
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h?rev=1416692&r1=1416691&r2=1416692&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/Broker.h Mon Dec 3 22:00:24 2012
@@ -284,7 +284,7 @@ class Broker : public sys::Runnable, pub
boost::function<std::vector<Url> ()> getKnownBrokers;
- static const std::string TCP_TRANSPORT;
+ static QPID_BROKER_EXTERN const std::string TCP_TRANSPORT;
void setRecovery(bool set) { recovery = set; }
bool getRecovery() const { return recovery; }
Modified: qpid/trunk/qpid/cpp/src/qpid/broker/QueueFlowLimit.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/broker/QueueFlowLimit.h?rev=1416692&r1=1416691&r2=1416692&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/broker/QueueFlowLimit.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/broker/QueueFlowLimit.h Mon Dec 3 22:00:24 2012
@@ -69,10 +69,10 @@ struct QueueSettings;
uint64_t size;
public:
- static const std::string flowStopCountKey;
- static const std::string flowResumeCountKey;
- static const std::string flowStopSizeKey;
- static const std::string flowResumeSizeKey;
+ static QPID_BROKER_EXTERN const std::string flowStopCountKey;
+ static QPID_BROKER_EXTERN const std::string flowResumeCountKey;
+ static QPID_BROKER_EXTERN const std::string flowStopSizeKey;
+ static QPID_BROKER_EXTERN const std::string flowResumeSizeKey;
QPID_BROKER_EXTERN virtual ~QueueFlowLimit();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org