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

Compilation fix for wxUSE_STD_STRING==0 build.

Browse Source 
Add missing check for wxUSE_STD_STRING to fix the build with it set to 0 after
the changes of r77518.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77529 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-09-03 14:23:38 +00:00
parent c87bf1a2a1
commit 46a4234643
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
include/wx/string.h
View File

@@ -3921,6 +3921,11 @@ wxDEFINE_ALL_COMPARISONS(const char *, const wxCStrData&, wxCMP_CHAR_CSTRDATA)
#if __cplusplus >= 201103L || wxCHECK_VISUALC_VERSION(10) #if __cplusplus >= 201103L || wxCHECK_VISUALC_VERSION(10)
// Don't do this if ToStdWstring() is not available. We could work around it
// but, presumably, if using std::wstring is undesirable, then so is using
// std::hash<> anyhow.
#if wxUSE_STD_STRING
#include <functional> #include <functional>
namespace std namespace std
@@ -3935,6 +3940,8 @@ namespace std
}; };
} // namespace std } // namespace std
#endif // wxUSE_STD_STRING
#endif // C++11 #endif // C++11
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------