From c8eda24a4ce5192ea502194387e5053098616561 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 17 Nov 2011 11:35:55 +0200
Subject: Rename odbc.hxx to mssql.hxx for consistency

---
 odb/mssql/auto-handle.cxx |  2 +-
 odb/mssql/connection.cxx  |  2 +-
 odb/mssql/database.cxx    |  2 +-
 odb/mssql/error.cxx       |  4 ++--
 odb/mssql/mssql.hxx       | 31 +++++++++++++++++++++++++++++++
 odb/mssql/odbc.hxx        | 31 -------------------------------
 6 files changed, 36 insertions(+), 36 deletions(-)
 create mode 100644 odb/mssql/mssql.hxx
 delete mode 100644 odb/mssql/odbc.hxx

diff --git a/odb/mssql/auto-handle.cxx b/odb/mssql/auto-handle.cxx
index 733ec92..118b5b6 100644
--- a/odb/mssql/auto-handle.cxx
+++ b/odb/mssql/auto-handle.cxx
@@ -3,7 +3,7 @@
 // copyright : Copyright (c) 2005-2011 Code Synthesis Tools CC
 // license   : ODB NCUEL; see accompanying LICENSE file
 
-#include <odb/mssql/odbc.hxx>
+#include <odb/mssql/mssql.hxx>
 #include <odb/mssql/auto-handle.hxx>
 
 namespace odb
diff --git a/odb/mssql/connection.cxx b/odb/mssql/connection.cxx
index ff62c49..50bc8db 100644
--- a/odb/mssql/connection.cxx
+++ b/odb/mssql/connection.cxx
@@ -7,7 +7,7 @@
 
 //#include <string>
 
-#include <odb/mssql/odbc.hxx>
+#include <odb/mssql/mssql.hxx>
 #include <odb/mssql/database.hxx>
 #include <odb/mssql/connection.hxx>
 //#include <odb/mssql/transaction.hxx>
diff --git a/odb/mssql/database.cxx b/odb/mssql/database.cxx
index 51010ac..a22ae9b 100644
--- a/odb/mssql/database.cxx
+++ b/odb/mssql/database.cxx
@@ -7,7 +7,7 @@
 
 #include <sstream>
 
-#include <odb/mssql/odbc.hxx>
+#include <odb/mssql/mssql.hxx>
 #include <odb/mssql/database.hxx>
 #include <odb/mssql/exceptions.hxx>
 #include <odb/mssql/error.hxx>
diff --git a/odb/mssql/error.cxx b/odb/mssql/error.cxx
index 0d26ae8..dd94156 100644
--- a/odb/mssql/error.cxx
+++ b/odb/mssql/error.cxx
@@ -3,9 +3,9 @@
 // copyright : Copyright (c) 2005-2011 Code Synthesis Tools CC
 // license   : GNU GPL v2; see accompanying LICENSE file
 
-#include <odb/mssql/odbc.hxx>
+#include <odb/mssql/mssql.hxx>
 #include <odb/mssql/error.hxx>
-//#include <odb/mssql/connection.hxx>
+#include <odb/mssql/connection.hxx>
 #include <odb/mssql/exceptions.hxx>
 
 using namespace std;
diff --git a/odb/mssql/mssql.hxx b/odb/mssql/mssql.hxx
new file mode 100644
index 0000000..80cff65
--- /dev/null
+++ b/odb/mssql/mssql.hxx
@@ -0,0 +1,31 @@
+// file      : odb/mssql/mssql.hxx
+// author    : Constantin Michael <constantin@codesynthesis.com>
+// copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
+// license   : ODB NCUEL; see accompanying LICENSE file
+
+#ifndef ODB_MSSQL_MSSQL_HXX
+#define ODB_MSSQL_MSSQL_HXX
+
+#include <odb/pre.hxx>
+
+// This file should always be included before mssql-fwd.hxx.
+//
+#ifdef ODB_MSSQL_MSSQL_FWD_HXX
+#  error odb/mssql/mssql-fwd.hxx included before odb/mssql/mssql.hxx
+#endif
+
+#ifdef _WIN32
+#  ifndef WIN32_LEAN_AND_MEAN
+#    define WIN32_LEAN_AND_MEAN
+#  endif
+#  include <windows.h>
+#endif
+
+#include <sqlext.h>  // Standard ODBC.
+
+//#define _SQLNCLI_ODBC_
+//#include <sqlncli.h> // SQL Server native client driver specifics.
+
+#include <odb/post.hxx>
+
+#endif // ODB_MSSQL_MSSQL_HXX
diff --git a/odb/mssql/odbc.hxx b/odb/mssql/odbc.hxx
deleted file mode 100644
index 7276a40..0000000
--- a/odb/mssql/odbc.hxx
+++ /dev/null
@@ -1,31 +0,0 @@
-// file      : odb/mssql/odbc.hxx
-// author    : Constantin Michael <constantin@codesynthesis.com>
-// copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
-// license   : ODB NCUEL; see accompanying LICENSE file
-
-#ifndef ODB_MSSQL_ODBC_HXX
-#define ODB_MSSQL_ODBC_HXX
-
-#include <odb/pre.hxx>
-
-// This file should always be included before mssql-fwd.hxx.
-//
-#ifdef ODB_MSSQL_MSSQL_FWD_HXX
-#  error odb/mssql/mssql-fwd.hxx included before odb/mssql/odbc.hxx
-#endif
-
-#ifdef _WIN32
-#  ifndef WIN32_LEAN_AND_MEAN
-#    define WIN32_LEAN_AND_MEAN
-#  endif
-#  include <windows.h>
-#endif
-
-#include <sqlext.h>  // Standard ODBC.
-
-//#define _SQLNCLI_ODBC_
-//#include <sqlncli.h> // SQL Server native client driver specifics.
-
-#include <odb/post.hxx>
-
-#endif // ODB_MSSQL_ODBC_HXX
-- 
cgit v1.1