Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

compilation fix for Borland C++

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47528 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2007-07-17 11:59:25 +00:00
parent 9ed9755237
commit e93523680b
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/wxcrt.h
View File

@@ -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 // 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) // wc_str(), because we store the pointer into (possibly converted)
// buffer in endptr and so it must be valid even when wxStrtod() returns // buffer in endptr and so it must be valid even when wxStrtod() returns
return wxStrtod((typename wxStrtoxCharType<T>::Type)nptr.c_str(), typedef typename wxStrtoxCharType<T>::Type CharType;
return wxStrtod((CharType)nptr.c_str(),
wxStrtoxCharType<T>::AsPointer(endptr)); wxStrtoxCharType<T>::AsPointer(endptr));
} }
} }
@@ -829,9 +830,12 @@ inline double wxStrtod(const wxCStrData& nptr, T endptr)
if ( endptr == 0 ) \ if ( endptr == 0 ) \
return name(nptr.wx_str(), (wxStringCharType**)NULL, base); \ return name(nptr.wx_str(), (wxStringCharType**)NULL, base); \
else \ else \
return name((typename wxStrtoxCharType<T>::Type)nptr.c_str(), \ { \
typedef typename wxStrtoxCharType<T>::Type CharType; \
return name((CharType)nptr.c_str(), \
wxStrtoxCharType<T>::AsPointer(endptr), \ wxStrtoxCharType<T>::AsPointer(endptr), \
base); \ base); \
} \
} \ } \
template<typename T> \ template<typename T> \
inline rettype name(const wxCStrData& nptr, T endptr, int base) \ inline rettype name(const wxCStrData& nptr, T endptr, int base) \