Changeset 1614a17 for molecuilder/src/Descriptors/AtomIdDescriptor_impl.hpp

Timestamp:

Feb 25, 2010, 11:15:22 AM (16 years ago)

Author:

Tillmann Crueger <crueger@…>

Children:

f467c6

Parents:

536380 (diff), 2e6496 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'StructureRefactoring' into MenuRefactoring

File:

• molecuilder/src/Descriptors/AtomIdDescriptor_impl.hpp (modified) (2 diffs)

molecuilder/src/Descriptors/AtomIdDescriptor_impl.hpp

@@ -1 @@
-#include "Descriptors/AtomIdDescriptor.hpp"
+#ifndef ATOMIDDESCRIPTOR_IMPL_HPP
+#define ATOMIDDESCRIPTOR_IMPL_HPP
+
 #include "Descriptors/AtomDescriptor_impl.hpp"
 
@@ -11 +13 @@
 
 protected:
-#if 0
-  atom *find();
-  std::vector<atom*> findAll();
-#endif
+  virtual atom *find();
+  virtual std::vector<atom*> findAll();
 private:
   int id;
 };
+
+#endif //ATOMIDDESCRIPTOR_IMPL_HPP