qpid-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From acon...@apache.org
Subject svn commit: r1494290 - in /qpid/trunk/qpid/cpp: include/qpid/types/Uuid.h src/qpid/ha/ReplicatingSubscription.h
Date Tue, 18 Jun 2013 20:38:08 GMT
Author: aconway
Date: Tue Jun 18 20:38:08 2013
New Revision: 1494290

URL: http://svn.apache.org/r1494290
Log:
NO-JIRA: Fix compile errors in Windows build.

Missing EXTERN declaration in types/Uuid.h.

Modified:
    qpid/trunk/qpid/cpp/include/qpid/types/Uuid.h
    qpid/trunk/qpid/cpp/src/qpid/ha/ReplicatingSubscription.h

Modified: qpid/trunk/qpid/cpp/include/qpid/types/Uuid.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/include/qpid/types/Uuid.h?rev=1494290&r1=1494289&r2=1494290&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/include/qpid/types/Uuid.h (original)
+++ qpid/trunk/qpid/cpp/include/qpid/types/Uuid.h Tue Jun 18 20:38:08 2013
@@ -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 {

Modified: qpid/trunk/qpid/cpp/src/qpid/ha/ReplicatingSubscription.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/ha/ReplicatingSubscription.h?rev=1494290&r1=1494289&r2=1494290&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/ha/ReplicatingSubscription.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/ha/ReplicatingSubscription.h Tue Jun 18 20:38:08 2013
@@ -143,7 +143,7 @@ class ReplicatingSubscription : public b
     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;
 };
 
 



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org


Mime
View raw message