X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2753fd96ffed24e04c4828eaa97dccfdb6b24764..e3735e7a9f6df9c84ba53461e3e4e7e80ce0e6d6:/src/msw/ole/uuid.cpp?ds=sidebyside

diff --git a/src/msw/ole/uuid.cpp b/src/msw/ole/uuid.cpp
index c21369b4ef..3bafbba898 100644
--- a/src/msw/ole/uuid.cpp
+++ b/src/msw/ole/uuid.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     12.09.96
-// RCS-ID:      $Id$
 // Copyright:   (c) 1998 Vadim Zeitlin <zeitlin@dptmaths.ens-cachan.fr>
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
@@ -20,7 +19,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 +83,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