Changes in src/helpers.hpp [a67d19:e138de]

File:

• src/helpers.hpp (modified) (5 diffs)

src/helpers.hpp

@@ -76 +76 @@
 };
 
-/** returns greater of the two values.
- * \param x first value
- * \param y second value
- * \return greater of the two (by operator>())
- */
-template <typename T> T Max(T x, T y)
-{
-  if (x > y)
-    return x;
-  else return y;
-};
-
-/** returns smaller of the two values.
- * \param x first value
- * \param y second value
- * \return smaller of the two (by operator<())
- */
-template <typename T> T Min(T x, T y)
-{
-  if (x < y)
-    return x;
-  else return y;
-};
-
 /** Creates a lookup table for true father's Atom::Nr -> atom ptr.
  * \param *start begin of chain list
@@ -114 +90 @@
 
   if (LookupTable != NULL) {
-    DoLog(0) && (Log() << Verbose(0) << "Pointer for Lookup table is not NULL! Aborting ..." <<endl);
+    Log() << Verbose(0) << "Pointer for Lookup table is not NULL! Aborting ..." <<endl;
     return false;
   }
@@ -127 +103 @@
   }
   if (count <= 0) {
-    DoLog(0) && (Log() << Verbose(0) << "Count of lookup list is 0 or less." << endl);
+    Log() << Verbose(0) << "Count of lookup list is 0 or less." << endl;
     return false;
   }
@@ -134 +110 @@
   LookupTable = Calloc<T*>(count, "CreateFatherLookupTable - **LookupTable");
   if (LookupTable == NULL) {
-    DoeLog(0) && (eLog()<< Verbose(0) << "LookupTable memory allocation failed!" << endl);
-    performCriticalExit();
+    eLog() << Verbose(0) << "LookupTable memory allocation failed!" << endl;
     status = false;
   } else {
@@ -146 +121 @@
         LookupTable[AtomNo] = Walker;
       } else {
-        DoLog(0) && (Log() << Verbose(0) << "Walker " << *Walker << " exceeded range of nuclear ids [0, " << count << ")." << endl);
+        Log() << Verbose(0) << "Walker " << *Walker << " exceeded range of nuclear ids [0, " << count << ")." << endl;
         status = false;
         break;