Changeset 9701 in orxonox.OLD for branches/new_class_id/src/lib/lang/new_class_id.h

Timestamp:

Aug 25, 2006, 11:20:21 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: new safer concept for NewClassID

File:

• branches/new_class_id/src/lib/lang/new_class_id.h (modified) (2 diffs)

branches/new_class_id/src/lib/lang/new_class_id.h

@@ -10 +10 @@
 #include <string>
 
+class NewObjectListBase;
+
 //! A class to dynamically allocate ClassID's and support a isA operator
 class NewClassID
@@ -15 +17 @@
 public:
   NewClassID();
-  NewClassID(int id, const std::string& name) : _id(id), _name(name) { };
+  NewClassID(const NewObjectListBase* id);
   // the copy constructor is also defined.
-  const int& id() const { return _id; };
-  const std::string& name() const { return _name; };
+  const int& id() const { return *_id; };
+  const std::string& name() const { return *_name; };
 
-  bool operator==(NewClassID id) const { return _id == id._id || _name == id._name; };
-  bool operator==(int id) const { return _id == id; };
-  bool operator==(const std::string& name) const { return _name == name; };
-  bool operator!=(NewClassID id) const { return _id != id._id && _name != id._name; };
-  bool operator!=(int id) const { return _id != id; };
-  bool operator!=(const std::string& name) const { return _name != name; };
+  bool operator==(const NewClassID& id) const { return *_id == *id._id /* || _name == id._name */; };
+  bool operator==(int id) const { return *_id == id; };
+  bool operator==(const std::string& name) const { return *_name == name; };
+  bool operator!=(const NewClassID& id) const { return *_id != *id._id /* && _name != id._name*/;  };
+  bool operator!=(int id) const { return *_id != id; };
+  bool operator!=(const std::string& name) const { return *_name != name; };
 
 private:
-  int                _id;
-  std::string        _name;
+  const int*                _id;
+  const std::string*        _name;
 };