aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2017-05-05 12:50:10 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2017-05-05 12:50:10 +0200
commita51a5b5cb918fb0fcae0055ec00ef8c763706399 (patch)
tree34b497ffcb7ccb3b480446dcc61b620a4c338c87
parent7d7232a694e0ec507ab0d23845f5796edb6bebb3 (diff)
Bump version to 2.5.0-b.2.z, master is open for business
-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 246b158..a98fc49 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 != 20451
+#if ODB_VERSION != 20452
# error incompatible odb interface version detected
#endif
// ODB Boost interface version: odb interface version plus the Boost interface
// version.
//
-#define ODB_BOOST_VERSION 2045100
-#define ODB_BOOST_VERSION_STR "2.5.0-b.1"
+#define ODB_BOOST_VERSION 2045200
+#define ODB_BOOST_VERSION_STR "2.5.0-b.2"
// 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 2049951
-#define LIBODB_BOOST_VERSION_STR "2.5.0-b.1"
+#define LIBODB_BOOST_VERSION 2049952
+#define LIBODB_BOOST_VERSION_STR "2.5.0-b.2"
#include <odb/post.hxx>
diff --git a/odb/boost/version.options b/odb/boost/version.options
index a656e84..d5ae6ec 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 != 2045100 // 2.5.0-b.1'
+--hxx-prologue '#if ODB_BOOST_VERSION != 2045200 // 2.5.0-b.2'
--hxx-prologue '# error ODB and C++ compilers see different libodb-boost interface versions'
--hxx-prologue '#endif'
diff --git a/version b/version
index 07ad3e3..00e2348 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.5.0-b.1
+2.5.0-b.2