VC++ 6 reports ambiguities when using template Read/Write, so

don't use them in this case


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@47848 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2007-08-01 15:30:16 +00:00
parent 6371dc5ddc
commit f81e22cf6e

View File

@@ -185,7 +185,8 @@ public:
// no default version since it does not make sense for binary data // no default version since it does not make sense for binary data
#endif // wxUSE_BASE64 #endif // wxUSE_BASE64
// Causes ambiguities in VC++ 6 (at least)
#if (!defined(__VISUALC__) || __VISUALC__ > 1200)
// read other types, for which wxFromString is defined // read other types, for which wxFromString is defined
template <typename T> template <typename T>
bool Read(const wxString& key, T* value) const bool Read(const wxString& key, T* value) const
@@ -208,6 +209,7 @@ public:
} }
return found; return found;
} }
#endif
// convenience functions returning directly the value (we don't have them for // convenience functions returning directly the value (we don't have them for
// int/double/bool as there would be ambiguities with the long one then) // int/double/bool as there would be ambiguities with the long one then)
@@ -278,11 +280,13 @@ public:
bool Write(const wxString& key, float value) bool Write(const wxString& key, float value)
{ return DoWriteDouble(key, value); } { return DoWriteDouble(key, value); }
// Causes ambiguities in VC++ 6 (at least)
#if (!defined(__VISUALC__) || __VISUALC__ > 1200)
// for other types, use wxToString() // for other types, use wxToString()
template <typename T> template <typename T>
bool Write(const wxString& key, T const& value) bool Write(const wxString& key, T const& value)
{ return Write(key, wxToString(value)); } { return Write(key, wxToString(value)); }
#endif
// permanently writes all changes // permanently writes all changes
virtual bool Flush(bool bCurrentOnly = false) = 0; virtual bool Flush(bool bCurrentOnly = false) = 0;