From c9f044cb38b6c0cff4b7dd82c69140ae30af26aa Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Tue, 18 Jun 2013 20:38:08 +0000 Subject: NO-JIRA: Fix compile errors in Windows build. Missing EXTERN declaration in types/Uuid.h. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1494290 13f79535-47bb-0310-9956-ffa450edef68 --- qpid/cpp/include/qpid/types/Uuid.h | 4 ++-- qpid/cpp/src/qpid/ha/ReplicatingSubscription.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'qpid/cpp') diff --git a/qpid/cpp/include/qpid/types/Uuid.h b/qpid/cpp/include/qpid/types/Uuid.h index 5e3ee94db0..43ec160ab3 100644 --- a/qpid/cpp/include/qpid/types/Uuid.h +++ b/qpid/cpp/include/qpid/types/Uuid.h @@ -57,7 +57,7 @@ class QPID_TYPES_CLASS_EXTERN Uuid /** String value in format 1b4e28ba-2fa1-11d2-883f-b9a761bde3fb. */ QPID_TYPES_EXTERN std::string str() const; - QPID_TYPES_EXTERN size_t size() const; + QPID_TYPES_EXTERN size_t size() const; QPID_TYPES_EXTERN const unsigned char* data() const; friend QPID_TYPES_EXTERN bool operator==(const Uuid&, const Uuid&); @@ -70,7 +70,7 @@ class QPID_TYPES_CLASS_EXTERN Uuid friend QPID_TYPES_EXTERN std::istream& operator>>(std::istream&, Uuid&); /** Hash value suitable for use with unordered_map */ - size_t hash() const; + QPID_TYPES_EXTERN size_t hash() const; /** Hasher for use with unordered_map */ struct Hasher { diff --git a/qpid/cpp/src/qpid/ha/ReplicatingSubscription.h b/qpid/cpp/src/qpid/ha/ReplicatingSubscription.h index d209faef9f..4d572c7f17 100644 --- a/qpid/cpp/src/qpid/ha/ReplicatingSubscription.h +++ b/qpid/cpp/src/qpid/ha/ReplicatingSubscription.h @@ -143,7 +143,7 @@ class ReplicatingSubscription : public broker::SemanticState::ConsumerImpl void sendIdEvent(ReplicationId, sys::Mutex::ScopedLock&); void sendEvent(const std::string& key, const std::string& data, sys::Mutex::ScopedLock&); void checkReady(sys::Mutex::ScopedLock&); - friend struct Factory; + friend class Factory; }; -- cgit v1.2.1