Changeset dfed1c for src/base/object.hpp

Timestamp:

Nov 22, 2011, 9:22:10 PM (14 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

facba0

Parents:

66f24d

Message:

Major vmg update.

git-svn-id: ​https://svn.version.fz-juelich.de/scafacos/trunk@1136 5161e1c8-67bf-11de-9fd5-51895aff932f

File:

• src/base/object.hpp (modified) (4 diffs)

src/base/object.hpp

@@ -22 +22 @@
   Object() :
     registered(false)
-  {}
+  {
+  }
 
   Object(std::string name_) :
@@ -29 +30 @@
   {
     ObjectInit();
+  }
+
+  Object(const Object& other) :
+    name(other.name),
+    registered(other.registered)
+  {
   }
 
@@ -38 +45 @@
   T* Cast()
   {
-    T* casted = static_cast<T*>(this);
+    T* casted = dynamic_cast<T*>(this);
     assert(casted != NULL);
     return casted;
@@ -56 +63 @@
 {
 public:
-  ObjectStorage(const T& val_) :
-    val(val_)
+  ObjectStorage(const T& val) :
+    val(val)
   {}
 
-  ObjectStorage(std::string name_, const T& val_) :
-    Object(name_),
-    val(val_)
+  ObjectStorage(std::string name, const T& val) :
+    Object(name),
+    val(val)
   {}
 
   T& Val() {return val;}
 
-private:
+protected:
   T val;
+};
+
+template <class T>
+class ObjectStorageArray : public ObjectStorage<T*>
+{
+public:
+  ObjectStorageArray(const vmg_int& size) :
+    ObjectStorage<T*>(new T[size])
+  {}
+
+  ObjectStorageArray(std::string name, const vmg_int& size) :
+    ObjectStorage<T*>(name, new T[size])
+  {}
+
+  virtual ~ObjectStorageArray()
+  {
+    delete [] this->val;
+  }
 };