Date: Wednesday, April 4, 2007 @ 16:32:32
Author: marc
Path: /cvsroot/carob/libmysequoia
Modified: include/CarobMySQL.hpp (1.46 -> 1.47) src/CarobMySQL.cpp (1.103
-> 1.104) src/MySQLAPI.cpp (1.71 -> 1.72)
Moved private macros [DEFAULT]_LOGGER_CONFIG_FILE and
[DEFAULT]_MYSEQUOIA_CONFIG_FILE out of the public .hpp space into
their respective .cpp files. Related to LMS-40
------------------------+
include/CarobMySQL.hpp | 8 --------
src/CarobMySQL.cpp | 8 ++++++++
src/MySQLAPI.cpp | 8 ++++++++
3 files changed, 16 insertions(+), 8 deletions(-)
Index: libmysequoia/include/CarobMySQL.hpp
diff -u libmysequoia/include/CarobMySQL.hpp:1.46
libmysequoia/include/CarobMySQL.hpp:1.47
--- libmysequoia/include/CarobMySQL.hpp:1.46 Wed Apr 4 16:23:11 2007
+++ libmysequoia/include/CarobMySQL.hpp Wed Apr 4 16:32:32 2007
@@ -41,14 +41,6 @@
const unsigned long MYSEQUOIA_MAGIC = 0xC00CA10B;
-#define LOGGER_CONFIG_FILE "logger.conf"
-#define MYSEQUOIA_CONFIG_FILE "mysequoia.conf"
-
-#ifndef CONFIGFILE_DIR
-#error missing CONFIGFILE_DIR definition. Check config.h
-#endif
-#define DEFAULT_LOGGER_CONFIG_FILE CONFIGFILE_DIR"/"LOGGER_CONFIG_FILE
-#define DEFAULT_MYSEQUOIA_CONFIG_FILE CONFIGFILE_DIR"/"MYSEQUOIA_CONFIG_FILE
class CarobStmt;
Index: libmysequoia/src/CarobMySQL.cpp
diff -u libmysequoia/src/CarobMySQL.cpp:1.103
libmysequoia/src/CarobMySQL.cpp:1.104
--- libmysequoia/src/CarobMySQL.cpp:1.103 Wed Apr 4 12:12:43 2007
+++ libmysequoia/src/CarobMySQL.cpp Wed Apr 4 16:32:32 2007
@@ -38,6 +38,14 @@
#include <string>
#include <algorithm>
+#define MYSEQUOIA_CONFIG_FILE "mysequoia.conf"
+
+#ifndef CONFIGFILE_DIR
+#error missing CONFIGFILE_DIR definition. Check config.h
+#endif
+#define DEFAULT_MYSEQUOIA_CONFIG_FILE CONFIGFILE_DIR"/"MYSEQUOIA_CONFIG_FILE
+
+
using namespace CarobNS;
using namespace std;
Index: libmysequoia/src/MySQLAPI.cpp
diff -u libmysequoia/src/MySQLAPI.cpp:1.71 libmysequoia/src/MySQLAPI.cpp:1.72
--- libmysequoia/src/MySQLAPI.cpp:1.71 Wed Apr 4 12:12:43 2007
+++ libmysequoia/src/MySQLAPI.cpp Wed Apr 4 16:32:32 2007
@@ -54,6 +54,14 @@
#define STRINGIFY(x) #x
#define TOSTRING(x) STRINGIFY(x)
+
+#define LOGGER_CONFIG_FILE "logger.conf"
+#ifndef CONFIGFILE_DIR
+#error missing CONFIGFILE_DIR definition. Check config.h
+#endif
+#define DEFAULT_LOGGER_CONFIG_FILE CONFIGFILE_DIR"/"LOGGER_CONFIG_FILE
+
+
using namespace log4cxx;
using namespace log4cxx::helpers;
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
