From 77b239d4ba3333c2313035a3ea1ca9ff5d6cdb0f Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Wed, 27 Apr 2011 18:51:00 +0000 Subject: [PATCH] Fix wxULongLong::ToDouble() for MSVC. The conversion of wxULongLong to double was broken for MSVC by r40658 which was supposed to correct some unspecified compilation problem but this code seems to compile fine with at least recent versions of MSVC and, in any case, correcting compilation only for the code to work incorrectly during run-time doesn't look like a good idea. This fixes current unit test failures in wxMSW. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@67634 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/longlong.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/include/wx/longlong.h b/include/wx/longlong.h index b90bd71873..de468676fd 100644 --- a/include/wx/longlong.h +++ b/include/wx/longlong.h @@ -411,11 +411,7 @@ public: } // convert to double -#ifdef _MSC_VER - double ToDouble() const { return wx_truncate_cast(double, (__int64) m_ll); } -#else double ToDouble() const { return wx_truncate_cast(double, m_ll); } -#endif // operations // addition -- 2.47.2