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

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48936 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

Browse Source
This commit is contained in:
Jouk Jansen
2007-09-25 14:39:47 +00:00
parent 58fda45507
commit 934960d133
11 changed files with 126 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/confbase.h
View File

@@ -185,8 +185,8 @@ public:
// no default version since it does not make sense for binary data
#endif // wxUSE_BASE64
// Causes ambiguities in VC++ 6 (at least)
#if (!defined(__VISUALC__) || __VISUALC__ > 1200)
// Causes ambiguities in VC++ 6 and OpenVMS (at least)
#if ( (!defined(__VISUALC__) || __VISUALC__ > 1200) && !defined( __VMS ) )
// read other types, for which wxFromString is defined
template <typename T>
bool Read(const wxString& key, T* value) const
@@ -294,8 +294,8 @@ public:
bool Write(const wxString& key, float value)
{ return DoWriteDouble(key, value); }
// Causes ambiguities in VC++ 6 (at least)
#if (!defined(__VISUALC__) || __VISUALC__ > 1200)
// Causes ambiguities in VC++ 6 and OpenVMS (at least)
#if ( (!defined(__VISUALC__) || __VISUALC__ > 1200) && !defined( __VMS ) )
// for other types, use wxToString()
template <typename T>
bool Write(const wxString& key, T const& value)