Changeset 1285Tweet

Timestamp:

Apr 24, 2012, 1:07:35 AM (11 years ago)

Author:

sam

Message:

core: add copy constructor and assignment operator to Array.

File:

• trunk/src/array.h (modified) (5 diffs)

trunk/src/array.h

@@ -31 +31 @@
     inline ~Array() { delete[] m_data; }
 
+    Array(Array const& that) : m_data(0), m_count(0), m_reserved(0)
+    {
+        Reserve(that.m_reserved);
+        memcpy(m_data, that.m_data, m_count * sizeof(Element));
+        m_count = that.m_count;
+    }
+
+    Array& operator=(Array const& that)
+    {
+        m_data = 0;
+        m_count = 0;
+        m_reserved = 0;
+        Reserve(that.m_reserved);
+        memcpy(m_data, that.m_data, that.m_count * sizeof(Element));
+        m_count = that.m_count;
+        return *this;
+    }
+
     inline Element& operator[](int n)
     {
@@ -118 +136 @@
     inline ~Array() { delete[] m_data; }
 
+    Array(Array const& that) : m_data(0), m_count(0), m_reserved(0)
+    {
+        Reserve(that.m_reserved);
+        memcpy(m_data, that.m_data, m_count * sizeof(Element));
+        m_count = that.m_count;
+    }
+
+    Array& operator=(Array const& that)
+    {
+        m_data = 0;
+        m_count = 0;
+        m_reserved = 0;
+        Reserve(that.m_reserved);
+        memcpy(m_data, that.m_data, that.m_count * sizeof(Element));
+        m_count = that.m_count;
+        return *this;
+    }
+
     inline Element& operator[](int n)
     {
@@ -198 +234 @@
 {
 public:
+    typedef T1 Element;
+
     inline Array() : m_data(0), m_count(0), m_reserved(0) {}
     inline ~Array() { delete[] m_data; }
 
-    inline T1& operator[](int n)
-    {
-        return m_data[n];
-    }
-
-    inline T1 const& operator[](int n) const
+    Array(Array const& that) : m_data(0), m_count(0), m_reserved(0)
+    {
+        Reserve(that.m_reserved);
+        memcpy(m_data, that.m_data, m_count * sizeof(Element));
+        m_count = that.m_count;
+    }
+
+    Array& operator=(Array const& that)
+    {
+        m_data = 0;
+        m_count = 0;
+        m_reserved = 0;
+        Reserve(that.m_reserved);
+        memcpy(m_data, that.m_data, that.m_count * sizeof(Element));
+        m_count = that.m_count;
+        return *this;
+    }
+
+    inline Element& operator[](int n)
+    {
+        return m_data[n];
+    }
+
+    inline Element const& operator[](int n) const
     {
         return m_data[n];
@@ -248 +304 @@
             return;
 
-        T1 *tmp = new T1[count];
+        Element *tmp = new Element[count];
         if (m_data)
         {
-            memcpy(tmp, m_data, m_count * sizeof(T1));
+            memcpy(tmp, m_data, m_count * sizeof(Element));
             delete[] m_data;
         }
@@ -259 +315 @@
 
     inline int Count() const { return m_count; }
-    inline int Bytes() const { return m_count * sizeof(T1); }
+    inline int Bytes() const { return m_count * sizeof(Element); }
 
 private:
-    T1 *m_data;
+    Element *m_data;
     int m_count, m_reserved;
 };