X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/38723be1d50facc0176455b69b409dcd457ac07a..a703012aedeb8064c8294c6aeeea95e6950ad170:/include/wx/vector.h diff --git a/include/wx/vector.h b/include/wx/vector.h index 777ee949a5..8cf76d9ff6 100644 --- a/include/wx/vector.h +++ b/include/wx/vector.h @@ -14,9 +14,11 @@ #include "wx/defs.h" -#if wxUSE_STL +#if wxUSE_STD_CONTAINERS #include +#include + #define wxVector std::vector template inline void wxVectorSort(wxVector& v) @@ -24,7 +26,7 @@ inline void wxVectorSort(wxVector& v) std::sort(v.begin(), v.end()); } -#else // !wxUSE_STL +#else // !wxUSE_STD_CONTAINERS #include "wx/utils.h" #include "wx/scopeguard.h" @@ -116,7 +118,10 @@ private: // Note that we use typedef instead of privately deriving from this (which // would allowed us to omit "Ops::" prefixes below) to keep VC6 happy, // it can't compile code that derives from wxIf<...>::value. - typedef typename wxIf< wxIsMovable::value, + // + // Note that bcc needs the extra parentheses for non-type template + // arguments to compile this expression. + typedef typename wxIf< (wxIsMovable::value), wxPrivate::wxVectorMemOpsMovable, wxPrivate::wxVectorMemOpsGeneric >::value Ops; @@ -446,22 +451,26 @@ inline typename wxVector::size_type wxVector::erase(size_type n) namespace wxPrivate { - // This function is a helper for the wxVectorSort function, and should - // not be used directly in user's code. +// This is a helper for the wxVectorSort function, and should not be used +// directly in user's code. template -int wxVectorSort_compare(const void* pitem1, const void* pitem2, const void* ) +struct wxVectorComparator { - const T& item1 = *reinterpret_cast(pitem1); - const T& item2 = *reinterpret_cast(pitem2); - - if (item1 < item2) - return -1; - else if (item2 < item1) - return 1; - else - return 0; -} + static int wxCMPFUNC_CONV + Compare(const void* pitem1, const void* pitem2, const void* ) + { + const T& item1 = *reinterpret_cast(pitem1); + const T& item2 = *reinterpret_cast(pitem2); + + if (item1 < item2) + return -1; + else if (item2 < item1) + return 1; + else + return 0; + } +}; } // namespace wxPrivate @@ -471,12 +480,12 @@ template void wxVectorSort(wxVector& v) { wxQsort(v.begin(), v.size(), sizeof(T), - wxPrivate::wxVectorSort_compare, NULL); + wxPrivate::wxVectorComparator::Compare, NULL); } -#endif // wxUSE_STL/!wxUSE_STL +#endif // wxUSE_STD_CONTAINERS/!wxUSE_STD_CONTAINERS #if WXWIN_COMPATIBILITY_2_8 #define WX_DECLARE_VECTORBASE(obj, cls) typedef wxVector cls