diff options
| author | Charles E. Rolke <chug@apache.org> | 2012-12-03 22:00:24 +0000 |
|---|---|---|
| committer | Charles E. Rolke <chug@apache.org> | 2012-12-03 22:00:24 +0000 |
| commit | 60fdec05fd9a64559d71678d941dacc1ea4cdb2a (patch) | |
| tree | 940133d7fc87ec8d22d9973f627ec4985888ba08 /qpid/cpp | |
| parent | be543778a480c9b9843522cac53203eb22c7f553 (diff) | |
| download | qpid-python-60fdec05fd9a64559d71678d941dacc1ea4cdb2a.tar.gz | |
QPID-4449 Repair some windows settings damaged during this jira.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1416692 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp')
| -rw-r--r-- | qpid/cpp/managementgen/qmfgen/templates/Event.h | 4 | ||||
| -rw-r--r-- | qpid/cpp/src/qpid/broker/Broker.h | 2 | ||||
| -rw-r--r-- | qpid/cpp/src/qpid/broker/QueueFlowLimit.h | 8 |
3 files changed, 7 insertions, 7 deletions
diff --git a/qpid/cpp/managementgen/qmfgen/templates/Event.h b/qpid/cpp/managementgen/qmfgen/templates/Event.h index 2e9898cf59..e5f5f53c1f 100644 --- a/qpid/cpp/managementgen/qmfgen/templates/Event.h +++ b/qpid/cpp/managementgen/qmfgen/templates/Event.h @@ -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*/ diff --git a/qpid/cpp/src/qpid/broker/Broker.h b/qpid/cpp/src/qpid/broker/Broker.h index f5742c8081..0a8f406dbf 100644 --- a/qpid/cpp/src/qpid/broker/Broker.h +++ b/qpid/cpp/src/qpid/broker/Broker.h @@ -284,7 +284,7 @@ class Broker : public sys::Runnable, public Plugin::Target, 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; } diff --git a/qpid/cpp/src/qpid/broker/QueueFlowLimit.h b/qpid/cpp/src/qpid/broker/QueueFlowLimit.h index beb6c50d1b..0e83457efa 100644 --- a/qpid/cpp/src/qpid/broker/QueueFlowLimit.h +++ b/qpid/cpp/src/qpid/broker/QueueFlowLimit.h @@ -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(); |