Changeset 8afe31 for molecuilder/src/defs.hpp

Timestamp:

Oct 5, 2009, 4:05:53 PM (16 years ago)

Author:

Frederik Heber <heber@…>

Children:

58808e

Parents:

e1f6d7 (diff), bf497f (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 'ConcaveHull' into ConvexHull

Conflicts:

.gitignore
molecuilder/src/Makefile.am
molecuilder/src/atom.cpp
molecuilder/src/tesselation.cpp

no serious overlaps, just a free Frees that were not present in ConcaveHull were MemoryAllocator class was added.

File:

• molecuilder/src/defs.hpp (modified) (1 diff)

molecuilder/src/defs.hpp

@@ -7 +7 @@
 #ifndef DEFS_HPP_
 #define DEFS_HPP_
-
-using namespace std;
 
 #define MYEPSILON 1e-13   //!< machine epsilon precision