aboutsummaryrefslogtreecommitdiff
path: root/odb
diff options
context:
space:
mode:
Diffstat (limited to 'odb')
-rw-r--r--odb/diagnostics.cxx (renamed from odb/error.cxx)4
-rw-r--r--odb/diagnostics.hxx (renamed from odb/error.hxx)8
-rw-r--r--odb/makefile2
-rw-r--r--odb/parser.cxx2
-rw-r--r--odb/pragma.cxx2
-rw-r--r--odb/relational/source.hxx2
-rw-r--r--odb/relational/type-processor.cxx2
7 files changed, 11 insertions, 11 deletions
diff --git a/odb/error.cxx b/odb/diagnostics.cxx
index 05a30ca..2b61370 100644
--- a/odb/error.cxx
+++ b/odb/diagnostics.cxx
@@ -1,10 +1,10 @@
-// file : odb/error.cxx
+// file : odb/diagnostics.cxx
// author : Boris Kolpackov <boris@codesynthesis.com>
// copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
// license : GNU GPL v3; see accompanying LICENSE file
#include <odb/gcc.hxx>
-#include <odb/error.hxx>
+#include <odb/diagnostics.hxx>
using namespace std;
diff --git a/odb/error.hxx b/odb/diagnostics.hxx
index 781cbc8..6f417cb 100644
--- a/odb/error.hxx
+++ b/odb/diagnostics.hxx
@@ -1,10 +1,10 @@
-// file : odb/error.hxx
+// file : odb/diagnostics.hxx
// author : Boris Kolpackov <boris@codesynthesis.com>
// copyright : Copyright (c) 2009-2011 Code Synthesis Tools CC
// license : GNU GPL v3; see accompanying LICENSE file
-#ifndef ODB_ERROR_HXX
-#define ODB_ERROR_HXX
+#ifndef ODB_DIAGNOSTICS_HXX
+#define ODB_DIAGNOSTICS_HXX
#include <odb/gcc-fwd.hxx>
@@ -53,4 +53,4 @@ location_line (location_t);
std::size_t
location_column (location_t);
-#endif // ODB_ERROR_HXX
+#endif // ODB_DIAGNOSTICS_HXX
diff --git a/odb/makefile b/odb/makefile
index 1665faf..493eca7 100644
--- a/odb/makefile
+++ b/odb/makefile
@@ -13,8 +13,8 @@ sql-token.cxx \
sql-lexer.cxx \
context.cxx \
common.cxx \
+diagnostics.cxx \
emitter.cxx \
-error.cxx \
lookup.cxx \
include.cxx \
header.cxx \
diff --git a/odb/parser.cxx b/odb/parser.cxx
index b8ea160..134aef1 100644
--- a/odb/parser.cxx
+++ b/odb/parser.cxx
@@ -13,7 +13,7 @@
#include <sstream>
#include <iostream>
-#include <odb/error.hxx>
+#include <odb/diagnostics.hxx>
#include <odb/parser.hxx>
#include <odb/semantics.hxx>
diff --git a/odb/pragma.cxx b/odb/pragma.cxx
index 17eaa42..66c026a 100644
--- a/odb/pragma.cxx
+++ b/odb/pragma.cxx
@@ -9,7 +9,7 @@
#include <vector>
#include <sstream>
-#include <odb/error.hxx>
+#include <odb/diagnostics.hxx>
#include <odb/lookup.hxx>
#include <odb/pragma.hxx>
#include <odb/cxx-token.hxx>
diff --git a/odb/relational/source.hxx b/odb/relational/source.hxx
index 86d60c7..8512c2d 100644
--- a/odb/relational/source.hxx
+++ b/odb/relational/source.hxx
@@ -11,7 +11,7 @@
#include <vector>
#include <sstream>
-#include <odb/error.hxx>
+#include <odb/diagnostics.hxx>
#include <odb/emitter.hxx>
#include <odb/relational/context.hxx>
diff --git a/odb/relational/type-processor.cxx b/odb/relational/type-processor.cxx
index 650294d..9996196 100644
--- a/odb/relational/type-processor.cxx
+++ b/odb/relational/type-processor.cxx
@@ -7,7 +7,7 @@
#include <vector>
-#include <odb/error.hxx>
+#include <odb/diagnostics.hxx>
#include <odb/lookup.hxx>
#include <odb/cxx-lexer.hxx>
#include <odb/common.hxx>