diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2011-10-28 10:27:29 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2011-10-28 10:27:29 +0200 |
| commit | e272f22cb7de919dfd490be82775a28b1878de8a (patch) | |
| tree | e3b3faf3367d9d8229c559e37b81016ba94b8fc5 | |
| parent | 3772ef6bd09cd0c39042bb0fb1b176b1a3308e10 (diff) | |
Introduce interface version for Qt and Boost profiles
This will allow us to make bugfix releases without having to update
ODB compiler binaries, which include these libraries.
| -rw-r--r-- | odb/boost/version.hxx | 10 | ||||
| -rw-r--r-- | odb/boost/version.options | 9 |
2 files changed, 14 insertions, 5 deletions
diff --git a/odb/boost/version.hxx b/odb/boost/version.hxx index e676932..4cdf098 100644 --- a/odb/boost/version.hxx +++ b/odb/boost/version.hxx @@ -33,9 +33,17 @@ # error incompatible odb interface version detected #endif -// libodb-boost version: odb interface version plus the bugfix +// 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" + +// 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" diff --git a/odb/boost/version.options b/odb/boost/version.options index 53903e4..cd21177 100644 --- a/odb/boost/version.options +++ b/odb/boost/version.options @@ -4,10 +4,11 @@ # license : GNU GPL v2; see accompanying LICENSE file # Make sure the options files as seen by the ODB compiler and header -# files as seen by the C++ compiler are from the same profile version. +# files as seen by the C++ compiler have the same Boost interface +# version. # --hxx-prologue '#include <odb/boost/version.hxx>' -#--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' +--hxx-prologue '#if ODB_BOOST_VERSION != 1060000 // 1.6.0' +--hxx-prologue '# error ODB and C++ compilers see different libodb-boost interface versions' +--hxx-prologue '#endif' |