From b79567fbc72df23f870049652d5f254aba948bea Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Fri, 16 Sep 2011 16:03:25 +0200
Subject: Support for views; integrated part

---
 odb/error.hxx | 41 ++++++++++++++++++++++++++++++++++-------
 1 file changed, 34 insertions(+), 7 deletions(-)

(limited to 'odb/error.hxx')

diff --git a/odb/error.hxx b/odb/error.hxx
index 2c3bd68..781cbc8 100644
--- a/odb/error.hxx
+++ b/odb/error.hxx
@@ -6,8 +6,9 @@
 #ifndef ODB_ERROR_HXX
 #define ODB_ERROR_HXX
 
-#include <odb/gcc.hxx>
+#include <odb/gcc-fwd.hxx>
 
+#include <cstddef>
 #include <iostream>
 
 #include <cutl/fs/path.hxx>
@@ -15,15 +16,41 @@
 using std::endl;
 
 std::ostream&
-error (cutl::fs::path const&, size_t line, size_t clmn);
+error (cutl::fs::path const&, std::size_t line, std::size_t clmn);
+
+std::ostream&
+warn (cutl::fs::path const&, std::size_t line, std::size_t clmn);
+
+std::ostream&
+info (cutl::fs::path const&, std::size_t line, std::size_t clmn);
 
 std::ostream&
 error (location_t);
 
-inline std::ostream&
-error ()
-{
-  return error (input_location);
-}
+std::ostream&
+warn (location_t);
+
+std::ostream&
+info (location_t);
+
+std::ostream&
+error ();
+
+std::ostream&
+warn ();
+
+std::ostream&
+info ();
+
+// location_t macro wrappers.
+//
+cutl::fs::path
+location_file (location_t);
+
+std::size_t
+location_line (location_t);
+
+std::size_t
+location_column (location_t);
 
 #endif // ODB_ERROR_HXX
-- 
cgit v1.1