aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2013-02-10 19:30:56 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2013-02-10 19:30:56 +0200
commitd23fa56895c00c4bc8d9e8e4606ba22e8ee72b31 (patch)
treeea298a70a35f507503ec71fed4fd254a1f361185
parent637d5eda177b94ec8bb42d51e587eadaf92f761b (diff)
Suppress some warnings
-rw-r--r--odb/odb.cxx2
-rw-r--r--odb/relational/common.cxx1
-rw-r--r--odb/relational/model.hxx1
3 files changed, 4 insertions, 0 deletions
diff --git a/odb/odb.cxx b/odb/odb.cxx
index a1f6209..577a904 100644
--- a/odb/odb.cxx
+++ b/odb/odb.cxx
@@ -68,8 +68,10 @@ path_search (path const&);
static path
driver_path (path const& driver);
+#ifndef ODB_STATIC_PLUGIN
static path
plugin_path (path const& driver);
+#endif
//
// Process manipulation.
diff --git a/odb/relational/common.cxx b/odb/relational/common.cxx
index b9d91f3..5e20f5f 100644
--- a/odb/relational/common.cxx
+++ b/odb/relational/common.cxx
@@ -14,5 +14,6 @@ namespace relational
database_type_id (semantics::data_member&)
{
assert (false);
+ return string ();
}
}
diff --git a/odb/relational/model.hxx b/odb/relational/model.hxx
index 2f45d70..fa09f2d 100644
--- a/odb/relational/model.hxx
+++ b/odb/relational/model.hxx
@@ -178,6 +178,7 @@ namespace relational
// Has to be implemented by the database-specific override.
//
assert (false);
+ return string ();
}
virtual void