Changeset 3d575e for molecuilder

Timestamp:

Mar 3, 2010, 7:17:19 PM (15 years ago)

Author:

Frederik Heber <heber@…>

Children:

296798

Parents:

a83171 (diff), d8fce3 (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 'FixLinkedCellConstructor_Setempytcheck' into Analysis_PairCorrelation

Conflicts:

molecuilder/src/linkedcell.cpp

Conflict was due to changes:

• set->empty() check prepended by set== NULL
• cout/cerr -> Log()/eLog()

Signed-off-by: Frederik Heber <heber@…>

File:

• molecuilder/src/linkedcell.cpp (modified) (1 diff)

molecuilder/src/linkedcell.cpp

@@ -46 +46 @@
   min.Zero();
   Log() << Verbose(1) << "Begin of LinkedCell" << endl;
-  if (set->IsEmpty()) {
-    eLog() << Verbose(1) << "set contains no linked cell nodes!" << endl;
+  if ((set == NULL) || (set->IsEmpty())) {
+    eLog() << Verbose(1) << "set is NULL or contains no linked cell nodes!" << endl;
     return;
   }