X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d8eff331e23435d9d8d6483a40f6fd9997a13f87..9fc5a47ce636e5daa425911d8c37ec2bf1789f2e:/include/wx/vector.h

diff --git a/include/wx/vector.h b/include/wx/vector.h
index 982cd08626..1d785e949d 100644
--- a/include/wx/vector.h
+++ b/include/wx/vector.h
@@ -118,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;
@@ -452,7 +455,7 @@ namespace wxPrivate
 // This is a helper for the wxVectorSort function, and should not be used
 // directly in user's code.
 template<typename T>
-struct wxVectorSort
+struct wxVectorComparator
 {
     static int wxCMPFUNC_CONV
     Compare(const void* pitem1, const void* pitem2, const void* )
@@ -477,7 +480,7 @@ template<typename T>
 void wxVectorSort(wxVector<T>& v)
 {
     wxQsort(v.begin(), v.size(), sizeof(T),
-            wxPrivate::wxVectorSort<T>::Compare, NULL);
+            wxPrivate::wxVectorComparator<T>::Compare, NULL);
 }