aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2014-11-20 06:48:24 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2014-11-20 06:48:24 +0200
commit9e86e33da6658c4c16a3ae1bfdbaf594fda31e1b (patch)
tree3ef255185a2f103184583adaaca589a76d0aac14
parente827043ef36b092968b247dac7a66d947be328f9 (diff)
parent28920335fe1b5b7758917c0ed7a6f72e6614c376 (diff)
Merge branch 'master' into bulkbulk
-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 da32f9c..e3cf796 100644
--- a/odb/boost/version.hxx
+++ b/odb/boost/version.hxx
@@ -28,23 +28,23 @@
// Check that we have compatible ODB version.
//
-#if ODB_VERSION != 20303
+#if ODB_VERSION != 20304
# error incompatible odb interface version detected
#endif
// ODB Boost interface version: odb interface version plus the Boost interface
// version.
//
-#define ODB_BOOST_VERSION 2030300
-#define ODB_BOOST_VERSION_STR "2.4.0.a3"
+#define ODB_BOOST_VERSION 2030400
+#define ODB_BOOST_VERSION_STR "2.4.0.a4"
// 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 2039903
-#define LIBODB_BOOST_VERSION_STR "2.4.0.a3"
+#define LIBODB_BOOST_VERSION 2039904
+#define LIBODB_BOOST_VERSION_STR "2.4.0.a4"
#include <odb/post.hxx>
diff --git a/odb/boost/version.options b/odb/boost/version.options
index 4e616d5..c3132f9 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 ODB_BOOST_VERSION != 2030300 // 2.4.0.a3'
+--hxx-prologue '#if ODB_BOOST_VERSION != 2030400 // 2.4.0.a4'
--hxx-prologue '# error ODB and C++ compilers see different libodb-boost interface versions'
--hxx-prologue '#endif'
diff --git a/version b/version
index 26d9ac3..42645da 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.4.0.a3
+2.4.0.a4