Changeset 417 for cafu/trunk

Timestamp:

11/02/11 08:25:12 (7 months ago)

Author:

Carsten

Message:

Added operators == and != to class ArrayT<T>, and replaced the comparison function callback for the QuickSort() method with a template parameter,
so that the compiler can possibly inline the comparison function, and optionally "functors" can be used in their place.

References #31.

Location:

cafu/trunk

Files:

• CaWE/GuiEditor/Commands/SetWinProp.cpp (modified) (1 diff)
• Libs/Templates/Array.hpp (modified) (5 diffs)

cafu/trunk/CaWE/GuiEditor/Commands/SetWinProp.cpp

@@ -46 +46 @@
 
     // If the new value isn't different from the old, don't put this command into the command history.
-    // if (m_NewValue==m_OldValue) return false;
+    if (m_NewValue==m_OldValue) return false;
 
     m_Value=m_NewValue;

cafu/trunk/Libs/Templates/Array.hpp

@@ -20 +20 @@
 */
 
-/*********************/
-/*** Array Library ***/
-/*********************/
-
-#ifndef _CA_ARRAY_HPP_
-#define _CA_ARRAY_HPP_
+#ifndef _CF_ARRAY_HPP_
+#define _CF_ARRAY_HPP_
 
 #include <stdlib.h>
 #include <cassert>
-
-#if defined(_WIN32) && defined(_MSC_VER)
-    #if (_MSC_VER<1300)
-        #define for if (false) ; else for
-
-        // Turn off warning 4786: "Bezeichner wurde auf '255' Zeichen in den Debug-Informationen reduziert."
-        #pragma warning(disable:4786)
-    #endif
-#endif
 
 
@@ -62 +49 @@
    ~ArrayT();                                                   ///< Destructor
     ArrayT<T>& operator = (const ArrayT<T>& OldArray);          ///< Assignment operator
+    bool operator == (const ArrayT<T>& Other) const;            ///< Equality operator
+    bool operator != (const ArrayT<T>& Other) const;            ///< Inequality operator
 
     unsigned long Size() const;                                 ///< Get size of array
@@ -78 +67 @@
     void          RemoveAt(unsigned long Index);
     void          RemoveAtAndKeepOrder(unsigned long Index);
-    void          QuickSort(bool (*IsLess)(const T& E1, const T& E2));
+    template<typename Function>
+    void          QuickSort(Function IsLess);
  // void          QuickSort(unsigned long FirstIndex, unsigned long LastIndex, bool (*IsLess)(const T& E1, const T& E2));
     int           Find(const T& Element) const;
@@ -120 +110 @@
     Elements       =NewElements;
     return *this;
+}
+
+
+template<class T> inline bool ArrayT<T>::operator == (const ArrayT<T>& Other) const
+{
+    if (NrOfElements != Other.NrOfElements)
+        return false;
+
+    for (unsigned long Nr=0; Nr<NrOfElements; Nr++)
+        if (Elements[Nr] != Other.Elements[Nr])
+            return false;
+
+    return true;
+}
+
+
+template<class T> inline bool ArrayT<T>::operator != (const ArrayT<T>& Other) const
+{
+    return !(this->operator == (Other));
 }
 
@@ -279 +288 @@
 
 
-template<class T> inline void ArrayT<T>::QuickSort(bool (*IsLess)(const T& E1, const T& E2))
+template<class T> template<typename Function> inline void ArrayT<T>::QuickSort(Function IsLess)
 {
     static ArrayT<unsigned long> ToDoRanges;