Changeset 77da65 for molecuilder

Timestamp:

Apr 24, 2008, 5:03:14 PM (17 years ago)

Author:

Frederik Heber <heber@…>

Children:

41d75d

Parents:

e58fcb7

Message:

ADDHYDROGEN and HAVE_DEBUG fix: config.h was not yet included

Misunderstanding of DHAVE_CONFIG_H lead to the believe it would get included also automatically. Now, helpers.hpp and parser.hpp both have it included if HAVE_CONFIG_H is present. Consequently, ADDHYDROGEN and HAVE_DEBUG now work.

Location:

molecuilder/src

Files:

• helpers.hpp (modified) (1 diff)
• molecules.hpp (modified) (1 diff)
• parser.cpp (modified) (3 diffs)
• parser.hpp (modified) (2 diffs)

molecuilder/src/helpers.hpp

@@ -20 +20 @@
 
 #include "defs.hpp"
+
+// include config.h
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 /********************************************** helpful functions *********************************/

molecuilder/src/molecules.hpp

@@ -19 +19 @@
 #include <set>
 #include <deque>
-
-// system specific headers
-#include <time.h>
-
 
 #include "helpers.hpp"

molecuilder/src/parser.cpp

@@ -5 +5 @@
  */
 
-using namespace std;
-
 // ======================================= INCLUDES ==========================================
 
@@ -19 +17 @@
  */
 #ifdef HAVE_INLINE
-inline
+inline bool FilePresent(const char *filename)
+#else
+bool FilePresent(const char *filename)
 #endif
-bool FilePresent(const char *filename)
 {
   ifstream input;
@@ -39 +38 @@
  * \return given inputdir is valid
  */
-#ifdef HAVE_INLINE
-inline
-#endif
 bool TestParams(int argc, char **argv)
 {

molecuilder/src/parser.hpp

@@ -9 +9 @@
 #define PARSING_HPP_
 
+using namespace std;
+
+// include config.h
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
 // ======================================= DEFINES ==========================================
 
-#define MYEPSILON 1e-13
 #define FactorsFile "BondFragmentTE-Factors.dat"
 #define ForcesFile "BondFragmentForces-Factors.dat"
@@ -26 +32 @@
 
 #ifdef HAVE_INLINE
-inline
+inline bool FilePresent(const char *filename);
+#else
+bool FilePresent(const char *filename);
 #endif
-bool FilePresent(const char *filename);
 
-#ifdef HAVE_INLINE
-inline
-#endif
 bool TestParams(int argc, char **argv);
+
 
 // ======================================= CLASS MatrixContainer =============================