Date: Tuesday, December 6, 2005 @ 09:37:37
Author: csaba
Path: /cvsroot/carob/libmysequoia
Modified: include/CarobMySQL.hpp (1.3 -> 1.4) src/CarobMySQL.cpp (1.4 ->
1.5)
Removed "using namespace CarobNS" from .hpp and put to .cpp
------------------------+
include/CarobMySQL.hpp | 8 +++-----
src/CarobMySQL.cpp | 2 ++
2 files changed, 5 insertions(+), 5 deletions(-)
Index: libmysequoia/include/CarobMySQL.hpp
diff -u libmysequoia/include/CarobMySQL.hpp:1.3
libmysequoia/include/CarobMySQL.hpp:1.4
--- libmysequoia/include/CarobMySQL.hpp:1.3 Tue Dec 6 09:25:35 2005
+++ libmysequoia/include/CarobMySQL.hpp Tue Dec 6 09:37:37 2005
@@ -31,8 +31,6 @@
#include <DriverResultSet.hpp>
#include <Statement.hpp>
-using namespace CarobNS;
-
class CarobMYSQL;
typedef struct st_cmysql {
@@ -189,9 +187,9 @@
private:
CMYSQL *mysqlPtr;
- Connection *connectionPtr;
- ConnectionPool *connectionPool;
- Statement *stmtPtr;
+ CarobNS::Connection *connectionPtr;
+ CarobNS::ConnectionPool *connectionPool;
+ CarobNS::Statement *stmtPtr;
//holds the result set for 'live' type of results
MYSQL_RES *liveResultPtr;
Index: libmysequoia/src/CarobMySQL.cpp
diff -u libmysequoia/src/CarobMySQL.cpp:1.4 libmysequoia/src/CarobMySQL.cpp:1.5
--- libmysequoia/src/CarobMySQL.cpp:1.4 Tue Dec 6 09:25:35 2005
+++ libmysequoia/src/CarobMySQL.cpp Tue Dec 6 09:37:37 2005
@@ -22,6 +22,8 @@
#include <CarobMySQL.hpp>
#include <Utils.hpp>
+using namespace CarobNS;
+
CarobMYSQL::CarobMYSQL (): connectionPtr(NULL), stmtPtr(NULL),
liveResultPtr(NULL)
{
//TODO handle special case when not enough memory
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits