From a0fa7d39f512ea62bb404005fb48fdd04d5aeff8 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 18 Aug 2008 20:05:51 +0000 Subject: [PATCH] fix MSVC warning about int->bool conversion introduced by r55113 [forward port from 2.8 branch] git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55126 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/msw/ole/uuid.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/msw/ole/uuid.cpp b/src/msw/ole/uuid.cpp index c21369b4ef..76a9680222 100644 --- a/src/msw/ole/uuid.cpp +++ b/src/msw/ole/uuid.cpp @@ -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) == TRUE; } // dtor -- 2.47.2