Date: Thursday, January 12, 2006 @ 21:15:20
Author: marc
Path: /cvsroot/carob/odbsequoia/src
Modified: abstract_item.cpp (1.1 -> 1.2) abstract_item.hpp (1.3 -> 1.4)
connect.cpp (1.7 -> 1.8) env.cpp (1.5 -> 1.6) explicit_type.cpp
(1.3 -> 1.4) inst.hpp (1.1 -> 1.2) stmt.hpp (1.4 -> 1.5)
util.hpp (1.2 -> 1.3)
Cleaned-up #includes: prevented multiple inclusions, reordered inclusions
top-down.
-------------------+
abstract_item.cpp | 3 ++-
abstract_item.hpp | 1 +
connect.cpp | 15 +++++++--------
env.cpp | 6 +++---
explicit_type.cpp | 5 ++---
inst.hpp | 5 +++++
stmt.hpp | 6 +++++-
util.hpp | 5 +++++
8 files changed, 30 insertions(+), 16 deletions(-)
Index: odbsequoia/src/abstract_item.cpp
diff -u odbsequoia/src/abstract_item.cpp:1.1
odbsequoia/src/abstract_item.cpp:1.2
--- odbsequoia/src/abstract_item.cpp:1.1 Wed Jan 11 17:25:05 2006
+++ odbsequoia/src/abstract_item.cpp Thu Jan 12 21:15:20 2006
@@ -19,10 +19,11 @@
* Contributor(s):
*/
-#include "util.hpp"
#include "abstract_item.hpp"
+#include "util.hpp"
+
using namespace ODBSeqNS;
SQLRETURN
Index: odbsequoia/src/abstract_item.hpp
diff -u odbsequoia/src/abstract_item.hpp:1.3
odbsequoia/src/abstract_item.hpp:1.4
--- odbsequoia/src/abstract_item.hpp:1.3 Wed Jan 11 17:25:05 2006
+++ odbsequoia/src/abstract_item.hpp Thu Jan 12 21:15:20 2006
@@ -24,6 +24,7 @@
#include <sqlucode.h>
#include <vector>
+#include <string>
namespace ODBSeqNS {
Index: odbsequoia/src/connect.cpp
diff -u odbsequoia/src/connect.cpp:1.7 odbsequoia/src/connect.cpp:1.8
--- odbsequoia/src/connect.cpp:1.7 Wed Jan 11 17:15:11 2006
+++ odbsequoia/src/connect.cpp Thu Jan 12 21:15:20 2006
@@ -18,20 +18,19 @@
* Initial developer(s): Marc Herbert
* Contributor(s):
*/
+#include "connect.hpp"
-
-#include <cstdlib> // for atoi()
-
-#include <odbcinst.h>
+#include "stmt.hpp"
+#include "util.hpp"
+#include "inst.hpp"
#include "Connection.hpp"
+#include "Common.hpp"
-#include "inst.hpp"
-#include "util.hpp"
+#include <odbcinst.h>
-#include "stmt.hpp"
+#include <cstdlib> // for atoi()
-#include "connect.hpp"
#define MAX_VALUE_LEN 100
Index: odbsequoia/src/env.cpp
diff -u odbsequoia/src/env.cpp:1.5 odbsequoia/src/env.cpp:1.6
--- odbsequoia/src/env.cpp:1.5 Wed Jan 11 17:07:27 2006
+++ odbsequoia/src/env.cpp Thu Jan 12 21:15:20 2006
@@ -19,13 +19,13 @@
* Contributor(s):
*/
+#include "env.hpp"
+
+#include "connect.hpp"
#include <sql.h>
-// unicode: 'W' (wchar) and 'A' protos
#include <sqlucode.h>
-#include "connect.hpp"
-
using namespace ODBSeqNS;
using namespace CarobNS;
Index: odbsequoia/src/explicit_type.cpp
diff -u odbsequoia/src/explicit_type.cpp:1.3
odbsequoia/src/explicit_type.cpp:1.4
--- odbsequoia/src/explicit_type.cpp:1.3 Wed Jan 11 17:25:05 2006
+++ odbsequoia/src/explicit_type.cpp Thu Jan 12 21:15:20 2006
@@ -25,10 +25,9 @@
* General implementation idea is: switch(type), cast, method call
*/
-
-#include "env.hpp"
-#include "connect.hpp"
#include "stmt.hpp"
+#include "connect.hpp"
+#include "env.hpp"
using namespace ODBSeqNS;
Index: odbsequoia/src/inst.hpp
diff -u odbsequoia/src/inst.hpp:1.1 odbsequoia/src/inst.hpp:1.2
--- odbsequoia/src/inst.hpp:1.1 Mon Jan 9 11:42:11 2006
+++ odbsequoia/src/inst.hpp Thu Jan 12 21:15:20 2006
@@ -19,6 +19,9 @@
* Contributor(s):
*/
+#ifndef ODBSEQ_INST
+#define ODBSEQ_INST
+
/* ODBC initialization files */
#ifndef WIN32
#define ODBC_INI "odbc.ini"
@@ -33,6 +36,8 @@
#define DATABASE_INI "Database"
#define PORT_INI "Port"
+#endif // include only once
+
/*
* Local Variables:
* c-file-style: "bsd"
Index: odbsequoia/src/stmt.hpp
diff -u odbsequoia/src/stmt.hpp:1.4 odbsequoia/src/stmt.hpp:1.5
--- odbsequoia/src/stmt.hpp:1.4 Wed Jan 11 17:47:12 2006
+++ odbsequoia/src/stmt.hpp Thu Jan 12 21:15:20 2006
@@ -19,6 +19,9 @@
* Contributor(s):
*/
+#ifndef ODBSEQ_NS
+#define ODBSEQ_NS
+
#include "connect.hpp"
namespace ODBSeqNS {
@@ -39,8 +42,9 @@
};
-}
+} // namespace
+#endif // include only once
/*
* Local Variables:
Index: odbsequoia/src/util.hpp
diff -u odbsequoia/src/util.hpp:1.2 odbsequoia/src/util.hpp:1.3
--- odbsequoia/src/util.hpp:1.2 Wed Jan 11 17:11:08 2006
+++ odbsequoia/src/util.hpp Thu Jan 12 21:15:20 2006
@@ -19,6 +19,9 @@
* Contributor(s):
*/
+#ifndef ODBSEQ_UTIL
+#define ODBSEQ_UTIL
+
#include <sql.h>
#include <sqlucode.h>
@@ -41,6 +44,8 @@
toSQLW(const std::wstring& in,
SQLWCHAR * const outbuf, const SQLSMALLINT bufsize, SQLSMALLINT *
outsize);
+#endif // include only once
+
/*
* Local Variables:
* c-file-style: "bsd"
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
