diff options
| -rw-r--r-- | libbutl-odb/README-DEV | 2 | ||||
| -rw-r--r-- | libbutl-odb/odb/sqlite/version.hxx | 16 | ||||
| -rw-r--r-- | libbutl-odb/odb/version.hxx | 16 | ||||
| m--------- | upstream/odb | 0 |
4 files changed, 17 insertions, 17 deletions
diff --git a/libbutl-odb/README-DEV b/libbutl-odb/README-DEV index 997f5a0..9ae7285 100644 --- a/libbutl-odb/README-DEV +++ b/libbutl-odb/README-DEV @@ -36,6 +36,6 @@ third-party package): - changes to buildfiles that would need to be replicated (including to root.build) -3. Replace verison.hxx with pre-generated for this submodule commit. +3. Replace TWO verison.hxx with pre-generated for this submodule commit. 4. Review .gitattributes for any symlink=dir changes. diff --git a/libbutl-odb/odb/sqlite/version.hxx b/libbutl-odb/odb/sqlite/version.hxx index 368d963..703cc5e 100644 --- a/libbutl-odb/odb/sqlite/version.hxx +++ b/libbutl-odb/odb/sqlite/version.hxx @@ -22,9 +22,9 @@ // 3.0.0-b.2 0000299999999995020 // 2.2.0-a.1.z 0000200001999990011 // -#define LIBODB_SQLITE_VERSION_FULL 200004999995270ULL -#define LIBODB_SQLITE_VERSION_STR "2.5.0-b.27" -#define LIBODB_SQLITE_VERSION_ID "2.5.0-b.27" +#define LIBODB_SQLITE_VERSION_FULL 200004999995281ULL +#define LIBODB_SQLITE_VERSION_STR "2.5.0-b.28.20240731125623.c6da3d9c4e9f" +#define LIBODB_SQLITE_VERSION_ID "2.5.0-b.28.c6da3d9c4e9f" #define LIBODB_SQLITE_VERSION_MAJOR 2 #define LIBODB_SQLITE_VERSION_MINOR 5 @@ -32,14 +32,14 @@ #define LIBODB_SQLITE_PRE_RELEASE true -#define LIBODB_SQLITE_SNAPSHOT 0ULL -#define LIBODB_SQLITE_SNAPSHOT_ID "" +#define LIBODB_SQLITE_SNAPSHOT 20240731125623ULL +#define LIBODB_SQLITE_SNAPSHOT_ID "c6da3d9c4e9f" #include <odb/version.hxx> #ifdef LIBODB_VERSION_FULL -# if !(LIBODB_VERSION_FULL == 200004999995270ULL) -# error incompatible libodb version, libodb == 2.5.0-b.27 is required +# if !(LIBODB_VERSION_FULL == 200004999995281ULL && LIBODB_SNAPSHOT == 20240731125623ULL) +# error incompatible libodb version, libodb == 2.5.0-b.28.20240731125623.c6da3d9c4e9f is required # endif #endif @@ -60,6 +60,6 @@ // 2.2.0.a1 02019901 // 3.0.0.b2 02999952 // -#define LIBODB_SQLITE_VERSION 2049977 +#define LIBODB_SQLITE_VERSION 2049978 #endif // LIBODB_SQLITE_VERSION diff --git a/libbutl-odb/odb/version.hxx b/libbutl-odb/odb/version.hxx index f918776..606b776 100644 --- a/libbutl-odb/odb/version.hxx +++ b/libbutl-odb/odb/version.hxx @@ -22,9 +22,9 @@ // 3.0.0-b.2 0000299999999995020 // 2.2.0-a.1.z 0000200001999990011 // -#define LIBODB_VERSION_FULL 200004999995270ULL -#define LIBODB_VERSION_STR "2.5.0-b.27" -#define LIBODB_VERSION_ID "2.5.0-b.27" +#define LIBODB_VERSION_FULL 200004999995281ULL +#define LIBODB_VERSION_STR "2.5.0-b.28.20240731125623.c6da3d9c4e9f" +#define LIBODB_VERSION_ID "2.5.0-b.28.c6da3d9c4e9f" #define LIBODB_VERSION_MAJOR 2 #define LIBODB_VERSION_MINOR 5 @@ -32,8 +32,8 @@ #define LIBODB_PRE_RELEASE true -#define LIBODB_SNAPSHOT 0ULL -#define LIBODB_SNAPSHOT_ID "" +#define LIBODB_SNAPSHOT 20240731125623ULL +#define LIBODB_SNAPSHOT_ID "c6da3d9c4e9f" // Old/deprecated numeric version format is AABBCCDD where: @@ -55,11 +55,11 @@ // ODB interface version: minor, major, and alpha/beta versions. // -#define ODB_VERSION 20477 -#define ODB_VERSION_STR "2.5-b.27" +#define ODB_VERSION 20478 +#define ODB_VERSION_STR "2.5-b.28" // libodb version: interface version plus the bugfix version. // -#define LIBODB_VERSION 2049977 +#define LIBODB_VERSION 2049978 #endif // LIBODB_VERSION diff --git a/upstream/odb b/upstream/odb -Subproject 2b5399efe314291449679d2336a1233444b3029 +Subproject c6da3d9c4e9f4263c754721d77f03f6a78309f5 |