From e93523680ba3c83cdae75b511214c82f28a2d853 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1clav=20Slav=C3=ADk?= Date: Tue, 17 Jul 2007 11:59:25 +0000 Subject: [PATCH] compilation fix for Borland C++ git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47528 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/wxcrt.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/include/wx/wxcrt.h b/include/wx/wxcrt.h index f64ca4c51f..0083ee1585 100644 --- a/include/wx/wxcrt.h +++ b/include/wx/wxcrt.h @@ -805,7 +805,8 @@ inline double wxStrtod(const wxString& nptr, T endptr) // note that it is important to use c_str() here and not mb_str() or // wc_str(), because we store the pointer into (possibly converted) // buffer in endptr and so it must be valid even when wxStrtod() returns - return wxStrtod((typename wxStrtoxCharType::Type)nptr.c_str(), + typedef typename wxStrtoxCharType::Type CharType; + return wxStrtod((CharType)nptr.c_str(), wxStrtoxCharType::AsPointer(endptr)); } } @@ -829,9 +830,12 @@ inline double wxStrtod(const wxCStrData& nptr, T endptr) if ( endptr == 0 ) \ return name(nptr.wx_str(), (wxStringCharType**)NULL, base); \ else \ - return name((typename wxStrtoxCharType::Type)nptr.c_str(), \ + { \ + typedef typename wxStrtoxCharType::Type CharType; \ + return name((CharType)nptr.c_str(), \ wxStrtoxCharType::AsPointer(endptr), \ base); \ + } \ } \ template \ inline rettype name(const wxCStrData& nptr, T endptr, int base) \ -- 2.47.2