You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by sh...@apache.org on 2010/01/18 23:40:15 UTC
svn commit: r900592 - in /qpid/trunk/qpid/cpp/src/qpid/sys/windows: uuid.cpp
uuid.h
Author: shuston
Date: Mon Jan 18 22:40:15 2010
New Revision: 900592
URL: http://svn.apache.org/viewvc?rev=900592&view=rev
Log:
Correct new uuid methods for Windows, add QPID_CLIENT_EXTERN where needed.
Modified:
qpid/trunk/qpid/cpp/src/qpid/sys/windows/uuid.cpp
qpid/trunk/qpid/cpp/src/qpid/sys/windows/uuid.h
Modified: qpid/trunk/qpid/cpp/src/qpid/sys/windows/uuid.cpp
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/windows/uuid.cpp?rev=900592&r1=900591&r2=900592&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/windows/uuid.cpp (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/windows/uuid.cpp Mon Jan 18 22:40:15 2010
@@ -58,5 +58,6 @@
}
int uuid_compare (const uuid_t a, const uuid_t b) {
- return memcmp(a, b, qpid::sys::UuidSize) == 0;
+ RPC_STATUS unused;
+ return !UuidEqual((UUID*)a, (UUID*)b, &unused);
}
Modified: qpid/trunk/qpid/cpp/src/qpid/sys/windows/uuid.h
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/sys/windows/uuid.h?rev=900592&r1=900591&r2=900592&view=diff
==============================================================================
--- qpid/trunk/qpid/cpp/src/qpid/sys/windows/uuid.h (original)
+++ qpid/trunk/qpid/cpp/src/qpid/sys/windows/uuid.h Mon Jan 18 22:40:15 2010
@@ -34,6 +34,6 @@
QPID_COMMON_EXTERN int uuid_is_null (const uuid_t uu); // Returns 1 if null, else 0
QPID_COMMON_EXTERN int uuid_parse (const char *in, uuid_t uu); // Returns 0 on success, else -1
QPID_COMMON_EXTERN void uuid_unparse (const uuid_t uu, char *out);
-QPID_COMMON_EXTERN void uuid_compare (const uuid_t a, const uuid_t b);
+QPID_COMMON_EXTERN int uuid_compare (const uuid_t a, const uuid_t b);
#endif /*!_sys_windows_uuid_h*/
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org