Date: Wednesday, March 8, 2006 @ 18:47:14
Author: marc
Path: /cvsroot/carob/odbsequoia/src
Added: odbc_exception.hpp (1.1)
Modified: abstract_item.cpp (1.9 -> 1.10) descriptors.cpp (1.1 -> 1.2)
stmt.cpp (1.14 -> 1.15) util.hpp (1.4 -> 1.5)
extracted odbc_exception.hpp from util.hpp
--------------------+
abstract_item.cpp | 1 +
descriptors.cpp | 1 +
odbc_exception.hpp | 47 +++++++++++++++++++++++++++++++++++++++++++++++
stmt.cpp | 2 +-
util.hpp | 9 ---------
5 files changed, 50 insertions(+), 10 deletions(-)
Index: odbsequoia/src/abstract_item.cpp
diff -u odbsequoia/src/abstract_item.cpp:1.9
odbsequoia/src/abstract_item.cpp:1.10
--- odbsequoia/src/abstract_item.cpp:1.9 Fri Feb 24 15:55:45 2006
+++ odbsequoia/src/abstract_item.cpp Wed Mar 8 18:47:14 2006
@@ -23,6 +23,7 @@
#include "abstract_item.hpp"
#include "util.hpp"
+#include "odbc_exception.hpp"
#include "CarobException.hpp"
Index: odbsequoia/src/descriptors.cpp
diff -u odbsequoia/src/descriptors.cpp:1.1 odbsequoia/src/descriptors.cpp:1.2
--- odbsequoia/src/descriptors.cpp:1.1 Fri Feb 24 16:12:43 2006
+++ odbsequoia/src/descriptors.cpp Wed Mar 8 18:47:14 2006
@@ -23,6 +23,7 @@
#include "descriptors.hpp"
#include "util.hpp"
+#include "odbc_exception.hpp"
// scatter these classes into multiple files when this file becomes too big
Index: odbsequoia/src/odbc_exception.hpp
diff -u /dev/null odbsequoia/src/odbc_exception.hpp:1.1
--- /dev/null Wed Mar 8 18:47:14 2006
+++ odbsequoia/src/odbc_exception.hpp Wed Mar 8 18:47:14 2006
@@ -0,0 +1,47 @@
+/*
+ * Sequoia: Database clustering technology.
+ * Copyright (C) 2006 Continuent, Inc.
+ * Contact: [EMAIL PROTECTED]
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Initial developer(s): Marc Herbert
+ * Contributor(s):
+ */
+
+#ifndef ODBSEQ_EXCEPTION
+#define ODBSEQ_EXCEPTION
+
+#include "CarobException.hpp"
+
+#include <string>
+
+
+class ODBSeqException : public CarobNS::CarobException
+{
+public:
+ ODBSeqException(std::wstring state, std::wstring msg) :
+ CarobException(msg)
+ { SQLState = state; };
+};
+
+
+#endif // include only once
+
+/*
+ * Local Variables:
+ * c-file-style: "bsd"
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * End:
+ */
Index: odbsequoia/src/stmt.cpp
diff -u odbsequoia/src/stmt.cpp:1.14 odbsequoia/src/stmt.cpp:1.15
--- odbsequoia/src/stmt.cpp:1.14 Fri Feb 24 16:12:43 2006
+++ odbsequoia/src/stmt.cpp Wed Mar 8 18:47:14 2006
@@ -20,9 +20,9 @@
*/
#include "Statement.hpp"
-#include "CarobException.hpp"
#include "util.hpp"
+#include "odbc_exception.hpp"
#include "stmt.hpp"
Index: odbsequoia/src/util.hpp
diff -u odbsequoia/src/util.hpp:1.4 odbsequoia/src/util.hpp:1.5
--- odbsequoia/src/util.hpp:1.4 Fri Feb 24 15:55:45 2006
+++ odbsequoia/src/util.hpp Wed Mar 8 18:47:14 2006
@@ -22,8 +22,6 @@
#ifndef ODBSEQ_UTIL
#define ODBSEQ_UTIL
-#include "CarobException.hpp"
-
#include <sql.h>
#include <sqlucode.h>
@@ -46,13 +44,6 @@
toSQLW(const std::wstring& in,
SQLWCHAR * const outbuf, const SQLSMALLINT bufsize, SQLSMALLINT *
outsize);
-class ODBSeqException : public CarobNS::CarobException
-{
-public:
- ODBSeqException(std::wstring state, std::wstring msg) :
- CarobException(msg)
- { SQLState = state; };
-};
#endif // include only once
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
