Date: Monday, January 23, 2006 @ 13:00:44
Author: marc
Path: /cvsroot/carob/odbsequoia/src
Modified: abstract_item.cpp (1.6 -> 1.7) abstract_item.hpp (1.11 -> 1.12)
connect.cpp (1.11 -> 1.12) connect.hpp (1.7 -> 1.8) stmt.cpp
(1.11 -> 1.12) stmt.hpp (1.8 -> 1.9)
Removed every #include "Carob.." in .hpp files thanks to forward declarations.
-------------------+
abstract_item.cpp | 8 ++++++++
abstract_item.hpp | 12 ++++++------
connect.cpp | 2 +-
connect.hpp | 8 +++++---
stmt.cpp | 2 +-
stmt.hpp | 8 ++++++--
6 files changed, 27 insertions(+), 13 deletions(-)
Index: odbsequoia/src/abstract_item.cpp
diff -u odbsequoia/src/abstract_item.cpp:1.6
odbsequoia/src/abstract_item.cpp:1.7
--- odbsequoia/src/abstract_item.cpp:1.6 Thu Jan 19 17:39:36 2006
+++ odbsequoia/src/abstract_item.cpp Mon Jan 23 13:00:44 2006
@@ -24,8 +24,16 @@
#include "util.hpp"
+#include "CarobException.hpp"
+
using namespace ODBSeqNS;
+DiagRecord::DiagRecord(const std::wstring& prefix, const
CarobNS::CarobException& ce) :
+ sql_state(ce.getSQLState()),
+ native_err((SQLINTEGER) ce.getErrorCode()),
+ message(prefix + ce.description())
+{ };
+
SQLRETURN
ODBCItem::get_diag_fieldw(SQLSMALLINT RecNumber, SQLSMALLINT DiagIdentifier,
SQLPOINTER const DiagInfoPtr,
Index: odbsequoia/src/abstract_item.hpp
diff -u odbsequoia/src/abstract_item.hpp:1.11
odbsequoia/src/abstract_item.hpp:1.12
--- odbsequoia/src/abstract_item.hpp:1.11 Thu Jan 19 18:02:08 2006
+++ odbsequoia/src/abstract_item.hpp Mon Jan 23 13:00:44 2006
@@ -20,7 +20,6 @@
* Contributor(s):
*/
-#include "CarobException.hpp"
#include <sql.h>
#include <sqlucode.h>
@@ -29,6 +28,11 @@
#include <string>
+// forward
+namespace CarobNS {
+ class CarobException;
+}
+
// STL's <functional> is a joke. Check Boost?
// "method" MUST return some SQLRETURN code
@@ -56,11 +60,7 @@
SQLINTEGER native_err;
std::wstring message;
public:
- DiagRecord::DiagRecord(const std::wstring& prefix, const
CarobNS::CarobException& ce) :
- sql_state(ce.getSQLState()),
- native_err((SQLINTEGER) ce.getErrorCode()),
- message(prefix + ce.description())
- { };
+ DiagRecord::DiagRecord(const std::wstring& prefix, const
CarobNS::CarobException& ce);
};
class ODBCItem
Index: odbsequoia/src/connect.cpp
diff -u odbsequoia/src/connect.cpp:1.11 odbsequoia/src/connect.cpp:1.12
--- odbsequoia/src/connect.cpp:1.11 Thu Jan 19 18:02:08 2006
+++ odbsequoia/src/connect.cpp Mon Jan 23 13:00:44 2006
@@ -26,6 +26,7 @@
#include "Connection.hpp"
#include "Common.hpp"
+#include "CarobException.hpp"
#include <odbcinst.h>
@@ -61,7 +62,6 @@
ODBCConnection::connectw(SQLWCHAR *sqlwdsn, SQLSMALLINT dsnlen,
SQLWCHAR *user, SQLSMALLINT userlen,
SQLWCHAR *pass, SQLSMALLINT passlen)
- throw (CarobException)
{
std::wstring wide_dsn(fromSQLW(sqlwdsn, dsnlen));
Index: odbsequoia/src/connect.hpp
diff -u odbsequoia/src/connect.hpp:1.7 odbsequoia/src/connect.hpp:1.8
--- odbsequoia/src/connect.hpp:1.7 Thu Jan 19 18:02:08 2006
+++ odbsequoia/src/connect.hpp Mon Jan 23 13:00:44 2006
@@ -22,10 +22,13 @@
#ifndef ODBSEQ_CONN
#define ODBSEQ_CONN
-#include "Connection.hpp"
#include "env.hpp"
+namespace CarobNS {
+ class Connection;
+}
+
namespace ODBSeqNS {
class ODBCConnection : public ODBCItem
@@ -42,8 +45,7 @@
SQLRETURN
connectw(SQLWCHAR *sqlwdsn, SQLSMALLINT dsnlen,
- SQLWCHAR *user, SQLSMALLINT userlen, SQLWCHAR *pass, SQLSMALLINT
passlen)
- throw (CarobNS::CarobException);
+ SQLWCHAR *user, SQLSMALLINT userlen, SQLWCHAR *pass, SQLSMALLINT
passlen);
};
Index: odbsequoia/src/stmt.cpp
diff -u odbsequoia/src/stmt.cpp:1.11 odbsequoia/src/stmt.cpp:1.12
--- odbsequoia/src/stmt.cpp:1.11 Thu Jan 19 17:39:36 2006
+++ odbsequoia/src/stmt.cpp Mon Jan 23 13:00:44 2006
@@ -20,6 +20,7 @@
*/
#include "Statement.hpp"
+#include "CarobException.hpp"
#include "util.hpp"
@@ -41,7 +42,6 @@
SQLRETURN
ODBCStatement::exec_directw(const SQLWCHAR *StatementText, SQLINTEGER
TextLength)
- throw (CarobException)
{
const std::wstring wstext = fromSQLW(StatementText, TextLength);
bool resultIsSet = carob_stmt->execute(wstext);
Index: odbsequoia/src/stmt.hpp
diff -u odbsequoia/src/stmt.hpp:1.8 odbsequoia/src/stmt.hpp:1.9
--- odbsequoia/src/stmt.hpp:1.8 Thu Jan 19 17:39:36 2006
+++ odbsequoia/src/stmt.hpp Mon Jan 23 13:00:44 2006
@@ -24,6 +24,11 @@
#include "connect.hpp"
+// forward
+namespace CarobNS {
+ class Statement;
+}
+
namespace ODBSeqNS {
enum stmt_state_t { S0, S1, S4, S5 };
@@ -38,8 +43,7 @@
ODBCStatement(const ODBCConnection& creator) : ODBCItem(creator)
{ state = S0; };
SQLRETURN
- exec_directw(const SQLWCHAR *StatementText, SQLINTEGER TextLength)
- throw (CarobNS::CarobException);
+ exec_directw(const SQLWCHAR *StatementText, SQLINTEGER TextLength);
const std::wstring&
get_diagids() const { return owner.get_diagids(); }; // connection has the
prefix/knows the source
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
