Fixed some warnings

[wxWidgets.git] / src / msw / ole / uuid.cpp

diff --git a/src/msw/ole/uuid.cpp b/src/msw/ole/uuid.cpp
index c21369b4ef0895263d0d1e60e5e74665f5808934..2153a25391f5135fba51b19a1fa2a807134afcd7 100644 (file)
--- a/src/msw/ole/uuid.cpp
+++ b/src/msw/ole/uuid.cpp
@@ -20,7 +20,7 @@
 #pragma hdrstop
 #endif
 
-#if wxUSE_OLE && ( wxUSE_DRAG_AND_DROP || (defined(__WXDEBUG__) && wxUSE_DATAOBJ) )
+#if wxUSE_OLE && (wxUSE_DRAG_AND_DROP || wxUSE_DATAOBJ)
 
 #ifndef WX_PRECOMP
     #include "wx/msw/wrapwin.h"
@@ -84,12 +84,9 @@ Uuid& Uuid::operator=(const Uuid& uuid)
 
 bool Uuid::operator==(const Uuid& uuid) const
 {
-  return m_uuid == uuid.m_uuid;
-}
-
-bool Uuid::operator!=(const Uuid& uuid) const
-{
-  return m_uuid != uuid.m_uuid;
+    // IsEqualGUID() returns BOOL and not bool so use an explicit comparison to
+    // avoid MSVC warnings about int->bool conversion
+    return IsEqualGUID(m_uuid, uuid.m_uuid) != 0;
 }
 
 // dtor