From: Julian Smart Date: Wed, 1 Aug 2007 15:30:16 +0000 (+0000) Subject: VC++ 6 reports ambiguities when using template Read/Write, so X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/f81e22cf6e38294a87fe10359ac6523a48ef11ee 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 --- diff --git a/include/wx/confbase.h b/include/wx/confbase.h index bcba0a1eea..9d97e49680 100644 --- a/include/wx/confbase.h +++ b/include/wx/confbase.h @@ -185,7 +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) // read other types, for which wxFromString is defined template bool Read(const wxString& key, T* value) const @@ -208,6 +209,7 @@ public: } return found; } +#endif // 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) @@ -278,11 +280,13 @@ public: bool Write(const wxString& key, float value) { return DoWriteDouble(key, value); } - + // Causes ambiguities in VC++ 6 (at least) +#if (!defined(__VISUALC__) || __VISUALC__ > 1200) // for other types, use wxToString() template bool Write(const wxString& key, T const& value) { return Write(key, wxToString(value)); } +#endif // permanently writes all changes virtual bool Flush(bool bCurrentOnly = false) = 0;