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

fix compilation for wxUSE_STD_STRING==0 case after latest change

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55392 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-08-31 14:41:26 +00:00
parent 9c7c6fa27b
commit 0514adaf75
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/wx/string.h
View File

@@ -841,19 +841,19 @@ public:
#else #else
#define WX_STR_ITERATOR_TAG std::random_access_iterator_tag #define WX_STR_ITERATOR_TAG std::random_access_iterator_tag
#endif #endif
#define WX_STR_ITERATOR_CATEGORY typedef WX_STR_ITERATOR_TAG iterator_category; #define WX_DEFINE_ITERATOR_CATEGORY(cat) typedef cat iterator_category;
#else #else
// not defining iterator_category at all in this case is better than defining // not defining iterator_category at all in this case is better than defining
// it as some dummy type -- at least it results in more intelligible error // it as some dummy type -- at least it results in more intelligible error
// messages // messages
#define WX_STR_ITERATOR_CATEGORY #define WX_DEFINE_ITERATOR_CATEGORY(cat)
#endif #endif
#define WX_STR_ITERATOR_IMPL(iterator_name, pointer_type, reference_type) \ #define WX_STR_ITERATOR_IMPL(iterator_name, pointer_type, reference_type) \
private: \ private: \
typedef wxStringImpl::iterator_name underlying_iterator; \ typedef wxStringImpl::iterator_name underlying_iterator; \
public: \ public: \
WX_STR_ITERATOR_CATEGORY \ WX_DEFINE_ITERATOR_CATEGORY(WX_STR_ITERATOR_TAG) \
typedef wxUniChar value_type; \ typedef wxUniChar value_type; \
typedef int difference_type; \ typedef int difference_type; \
typedef reference_type reference; \ typedef reference_type reference; \
@@ -1088,7 +1088,7 @@ public:
public: public:
typedef T iterator_type; typedef T iterator_type;
typedef typename T::iterator_category iterator_category; WX_DEFINE_ITERATOR_CATEGORY(typename T::iterator_category)
typedef typename T::value_type value_type; typedef typename T::value_type value_type;
typedef typename T::difference_type difference_type; typedef typename T::difference_type difference_type;
typedef typename T::reference reference; typedef typename T::reference reference;