aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2011-11-02 15:08:25 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2011-11-02 15:08:25 +0200
commit8eccd5b6cdfd8b60a74f539bdca8439ef6af5611 (patch)
treebaa09052fd536d88ea70c306f54d76e0d76e7ccd
parente272f22cb7de919dfd490be82775a28b1878de8a (diff)
Bump version to 1.7.0.a1
-rw-r--r--odb/boost/version.hxx10
-rw-r--r--odb/boost/version.options2
-rw-r--r--version2
3 files changed, 7 insertions, 7 deletions
diff --git a/odb/boost/version.hxx b/odb/boost/version.hxx
index 4cdf098..53ad92b 100644
--- a/odb/boost/version.hxx
+++ b/odb/boost/version.hxx
@@ -29,23 +29,23 @@
// Check that we have compatible ODB version.
//
-#if ODB_VERSION != 10600
+#if ODB_VERSION != 10601
# error incompatible odb interface version detected
#endif
// ODB Boost interface version: odb interface version plus the Boost interface
// version.
//
-#define ODB_BOOST_VERSION 1060000
-#define ODB_BOOST_VERSION_STR "1.6.0"
+#define ODB_BOOST_VERSION 1069901
+#define ODB_BOOST_VERSION_STR "1.7.0.a1"
// libodb-boost version: odb interface version plus the bugfix version. Note
// that LIBODB_BOOST_VERSION is always greater or equal to ODB_BOOST_VERSION
// since if the Boost interface virsion is incremented then the bugfix version
// must be incremented as well.
//
-#define LIBODB_BOOST_VERSION 1060000
-#define LIBODB_BOOST_VERSION_STR "1.6.0"
+#define LIBODB_BOOST_VERSION 1069901
+#define LIBODB_BOOST_VERSION_STR "1.7.0.a1"
#include <odb/post.hxx>
diff --git a/odb/boost/version.options b/odb/boost/version.options
index cd21177..904656b 100644
--- a/odb/boost/version.options
+++ b/odb/boost/version.options
@@ -9,6 +9,6 @@
#
--hxx-prologue '#include <odb/boost/version.hxx>'
---hxx-prologue '#if ODB_BOOST_VERSION != 1060000 // 1.6.0'
+--hxx-prologue '#if ODB_BOOST_VERSION != 1069901 // 1.7.0.a1'
--hxx-prologue '# error ODB and C++ compilers see different libodb-boost interface versions'
--hxx-prologue '#endif'
diff --git a/version b/version
index dc1e644..38a3807 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.6.0
+1.7.0.a1