aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2011-07-27 17:00:12 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2011-07-27 17:00:12 +0200
commit7051803dcbde4c52507361d6b471746cc5e88dce (patch)
treedd4ca6ce280eaf79be05b4ea1011a68648d63521
parent49e2cda8e64f0dce532c3e1bed6f0641005de4d3 (diff)
Bump version to 1.6.0
-rw-r--r--odb/boost/version.hxx6
-rw-r--r--odb/boost/version.options2
-rw-r--r--version2
3 files changed, 5 insertions, 5 deletions
diff --git a/odb/boost/version.hxx b/odb/boost/version.hxx
index 27a9dca..e676932 100644
--- a/odb/boost/version.hxx
+++ b/odb/boost/version.hxx
@@ -29,15 +29,15 @@
// Check that we have compatible ODB version.
//
-#if ODB_VERSION != 10500
+#if ODB_VERSION != 10600
# error incompatible odb interface version detected
#endif
// libodb-boost version: odb interface version plus the bugfix
// version.
//
-#define LIBODB_BOOST_VERSION 1050000
-#define LIBODB_BOOST_VERSION_STR "1.5.0"
+#define LIBODB_BOOST_VERSION 1060000
+#define LIBODB_BOOST_VERSION_STR "1.6.0"
#include <odb/post.hxx>
diff --git a/odb/boost/version.options b/odb/boost/version.options
index 475436a..53903e4 100644
--- a/odb/boost/version.options
+++ b/odb/boost/version.options
@@ -8,6 +8,6 @@
#
--hxx-prologue '#include <odb/boost/version.hxx>'
-#--hxx-prologue '#if LIBODB_BOOST_VERSION != 1050000 // 1.5.0'
+#--hxx-prologue '#if LIBODB_BOOST_VERSION != 1060000 // 1.6.0'
#--hxx-prologue '# error ODB and C++ compilers see different libodb-boost versions'
#--hxx-prologue '#endif'
diff --git a/version b/version
index bc80560..dc1e644 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.5.0
+1.6.0