Changeset 14039 for trunk

Timestamp:

06/02/12 15:39:36 (12 years ago)

Author:

tbretz

Message:

HAS_SQL -> HAVE_SQL

File:

• trunk/FACT++/src/drivectrl.cc (modified) (4 diffs)

trunk/FACT++/src/drivectrl.cc

@@ -5 +5 @@
 #include <libnova/solar.h>
 #include <libnova/rise_set.h>
+#endif
+
+#ifdef HAVE_SQL
+#include <mysql++/mysql++.h>
 #endif
 
@@ -20 +24 @@
 
 #include "tools.h"
-
-#define HAS_SQL
-
-#ifdef HAS_SQL
-#include <mysql++/mysql++.h>
-#endif
 
 #include "HeadersDrive.h"
@@ -1227 +1225 @@
     void ReadDatabase(bool print=true)
     {
+#ifdef HAVE_SQL
         //static const boost::regex expr("(([[:word:].-]+)(:(.+))?@)?([[:word:].-]+)(:([[:digit:]]+))?(/([[:word:].-]+))?");
         static const boost::regex expr("(([[:word:].-]+)(:(.+))?@)?([[:word:].-]+)(:([[:digit:]]+))?(/([[:word:].-]+))");
@@ -1295 +1294 @@
             }
         }
+#else
+        T::Warn("MySQL support not compiled into the program.");
+#endif
     }