Fix compilation with MinGW -std=c++11 option.

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

diff --git a/src/msw/ole/uuid.cpp b/src/msw/ole/uuid.cpp
index 7fe591484fb44dca8fbc4ed2608596b0fbd9085b..2153a25391f5135fba51b19a1fa2a807134afcd7 100644 (file)
--- a/src/msw/ole/uuid.cpp
+++ b/src/msw/ole/uuid.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////////
-// Name:        ole/uuid.cpp
+// Name:        src/msw/ole/uuid.cpp
 // Purpose:     implements Uuid class, see uuid.h for details
 // Author:      Vadim Zeitlin
 // Modified by:
@@ -13,10 +13,6 @@
 // Declarations
 // ============================================================================
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-#pragma implementation "uuid.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -24,14 +20,12 @@
 #pragma hdrstop
 #endif
 
-#include  "wx/setup.h"
+#if wxUSE_OLE && (wxUSE_DRAG_AND_DROP || wxUSE_DATAOBJ)
 
-#if wxUSE_OLE && ( wxUSE_DRAG_AND_DROP || (defined(__WXDEBUG__) && wxUSE_DATAOBJ) )
-
-// standard headers
-#if wxCHECK_W32API_VERSION( 1, 0 )
+#ifndef WX_PRECOMP
     #include "wx/msw/wrapwin.h"
 #endif
+
 #include  <rpc.h>                       // UUID related functions
 
 #include  "wx/msw/ole/uuid.h"
@@ -88,6 +82,13 @@ Uuid& Uuid::operator=(const Uuid& uuid)
   return *this;
 }
 
+bool Uuid::operator==(const Uuid& uuid) const
+{
+    // 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
 Uuid::~Uuid()
 {