Fix compilation in !wxUSE_LOG_DEBUG && !HAVE_VARIADIC_MACROS case.

[wxWidgets.git] / include / wx / vector.h

diff --git a/include/wx/vector.h b/include/wx/vector.h
index c30f158e8baac0c9c7519ddd8f05f55f4e7465cb..e95d4103ef11c1d65c92ed76381cb0bad4764ec2 100644 (file)
--- 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 <vector>
+#include <algorithm>
+
 #define wxVector std::vector
 template<typename T>
 inline void wxVectorSort(wxVector<T>& v)
@@ -24,7 +26,7 @@ inline void wxVectorSort(wxVector<T>& 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<T>::value,
+    //
+    // Note that bcc needs the extra parentheses for non-type template
+    // arguments to compile this expression.
+    typedef typename wxIf< (wxIsMovable<T>::value),
                            wxPrivate::wxVectorMemOpsMovable<T>,
                            wxPrivate::wxVectorMemOpsGeneric<T> >::value
             Ops;
@@ -446,22 +451,26 @@ inline typename wxVector<T>::size_type wxVector<T>::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<typename T>
-int wxCMPFUNC_CONV wxVectorSort_compare(const void* pitem1, const void* pitem2, const void* )
+struct wxVectorComparator
 {
-    const T& item1 = *reinterpret_cast<const T*>(pitem1);
-    const T& item2 = *reinterpret_cast<const T*>(pitem2);
-
-    if (item1 < item2)
-        return -1;
-    else if (item2 < item1)
-        return 1;
-    else
-        return 0;
-}
+    static int
+    Compare(const void* pitem1, const void* pitem2, const void* )
+    {
+        const T& item1 = *reinterpret_cast<const T*>(pitem1);
+        const T& item2 = *reinterpret_cast<const T*>(pitem2);
+
+        if (item1 < item2)
+            return -1;
+        else if (item2 < item1)
+            return 1;
+        else
+            return 0;
+    }
+};
 
 }  // namespace wxPrivate
 
@@ -471,12 +480,12 @@ template<typename T>
 void wxVectorSort(wxVector<T>& v)
 {
     wxQsort(v.begin(), v.size(), sizeof(T),
-            wxPrivate::wxVectorSort_compare<T>, NULL);
+            wxPrivate::wxVectorComparator<T>::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<obj> cls