Changeset 0f7883 for molecuilder/src/Parser/ChangeTracker.cpp

Timestamp:

Apr 1, 2010, 12:16:29 PM (15 years ago)

Author:

Saskia Metzler <metzler@…>

Children:

d3513b

Parents:

2704e2 (diff), 770138 (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 Till's structure refactoring

Merge commit 'till/StructureRefactoring' into StateAndFormatParser

Conflicts:

molecuilder/src/Makefile.am
molecuilder/src/unittests/Makefile.am

File:

• molecuilder/src/Parser/ChangeTracker.cpp (modified) (2 diffs)

molecuilder/src/Parser/ChangeTracker.cpp

@@ -15 +15 @@
 ChangeTracker::ChangeTracker() {
   isConsistent = true;
-  World::get()->signOn(this);
+  World::getInstance().signOn(this);
 }
 
@@ -22 +22 @@
  */
 ChangeTracker::~ChangeTracker() {
-  World::get()->signOff(this);
+  World::getInstance().signOff(this);
 }