Changeset e08f45 for molecuilder/src/verbose.cpp

Timestamp:

Feb 9, 2009, 5:24:10 PM (17 years ago)

Author:

Frederik Heber <heber@…>

Children:

451d7a

Parents:

4aef8a

git-author:

Frederik Heber <heber@…> (02/09/09 15:55:37)

git-committer:

Frederik Heber <heber@…> (02/09/09 17:24:10)

Message:

Merge branch 'ConcaveHull' of ../espack2 into ConcaveHull

Conflicts:

molecuilder/src/boundary.cpp
molecuilder/src/boundary.hpp
molecuilder/src/builder.cpp
molecuilder/src/linkedcell.cpp
molecuilder/src/linkedcell.hpp
molecuilder/src/vector.cpp
molecuilder/src/vector.hpp
util/src/NanoCreator.c

Basically, this resulted from a lot of conversions two from spaces to one tab, which is my standard indentation. The mess was caused by eclipse auto-indenting. And in espack2:ConcaveHull was the new stuff, so all from ConcaveHull was replaced in case of doubt.
Additionally, vector had ofstream << operator instead ostream << ...

File:

• molecuilder/src/verbose.cpp (modified) (2 diffs, 1 prop)

molecuilder/src/verbose.cpp

@@ -7 +7 @@
 ostream& Verbose::print (ostream &ost) const
 {
-  for (int i=Verbosity;i--;)
-    ost.put('\t');
-  //cout << "Verbose(.) called." << endl;
-  return ost;
+        for (int i=Verbosity;i--;)
+                ost.put('\t');
+        //cout << "Verbose(.) called." << endl;
+        return ost;
 };
 
@@ -35 +35 @@
         int bits = 1, counter = 1;
         while ((bits = 1 << counter) < BinaryNumber)
-    counter++;
-  for (int i=0;i<counter-1;i++) {
-        if ((BinaryNumber & (1 << i)) == 0)
-                ost.put('0');
+                counter++;
+        for (int i=0;i<counter-1;i++) {
+                if ((BinaryNumber & (1 << i)) == 0)
+                        ost.put('0');
                 else
-                ost.put('1');
-  }
-  ost.put('b');
-  //cout << "Binary(.) called." << endl;
-  return ost;
+                        ost.put('1');
+        }
+        ost.put('b');
+        //cout << "Binary(.) called." << endl;
+        return ost;
 };