From 0c0c237ab3904cb82b85f96984ed81e8c726ebb0 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Sun, 14 Aug 2016 12:28:17 +0200
Subject: Various build2-related fixes

---
 odb/sqlite/buildfile                  | 2 +-
 odb/sqlite/details/build2/config-vc.h | 2 +-
 odb/sqlite/details/config.hxx         | 4 ++--
 tests/basics/driver.cxx               | 7 +++++++
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/odb/sqlite/buildfile b/odb/sqlite/buildfile
index ff42128..94d5f2a 100644
--- a/odb/sqlite/buildfile
+++ b/odb/sqlite/buildfile
@@ -1,4 +1,4 @@
-# file      : odb/buildfile
+# file      : odb/sqlite/buildfile
 # copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC
 # license   : GNU GPL v2; see accompanying LICENSE file
 
diff --git a/odb/sqlite/details/build2/config-vc.h b/odb/sqlite/details/build2/config-vc.h
index 0fd79ee..a492e4e 100644
--- a/odb/sqlite/details/build2/config-vc.h
+++ b/odb/sqlite/details/build2/config-vc.h
@@ -1,4 +1,4 @@
-/* file      : odb/details/build2/config-vc.h
+/* file      : odb/sqlite/details/build2/config-vc.h
  * copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC
  * license   : GNU GPL v2; see accompanying LICENSE file
  */
diff --git a/odb/sqlite/details/config.hxx b/odb/sqlite/details/config.hxx
index 1f31178..57cbd17 100644
--- a/odb/sqlite/details/config.hxx
+++ b/odb/sqlite/details/config.hxx
@@ -11,9 +11,9 @@
 #  error libodb-sqlite header included in odb-compiled header
 #elif !defined(LIBODB_SQLITE_BUILD2)
 #  ifdef _MSC_VER
-#    include <odb/details/config-vc.h>
+#    include <odb/sqlite/details/config-vc.h>
 #  else
-#    include <odb/details/config.h>
+#    include <odb/sqlite/details/config.h>
 #  endif
 #endif
 
diff --git a/tests/basics/driver.cxx b/tests/basics/driver.cxx
index bcdd210..f45985a 100644
--- a/tests/basics/driver.cxx
+++ b/tests/basics/driver.cxx
@@ -6,6 +6,7 @@
 // is done in the odb-tests package.
 
 #include <cassert>
+#include <sstream>
 
 #include <odb/sqlite/database.hxx>
 #include <odb/sqlite/exceptions.hxx>
@@ -16,6 +17,12 @@ using namespace odb::sqlite;
 int
 main ()
 {
+  {
+    std::ostringstream os;
+    database::print_usage (os);
+    assert (!os.str ().empty ());
+  }
+
   database db (":memory:");
 
   {
-- 
cgit v1.1