aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2018-10-30 17:40:39 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2018-10-30 17:40:39 +0300
commit2fbdfa4d3df7c09d82bd2c5685420eee5d6dea18 (patch)
tree9c7ec8bad0ba29739af887f995c95b648469242f
parent873987793b05fc0d6e9908f5030b2bca145c4e6d (diff)
Fix to compile with g++ 4.9
-rw-r--r--migrate/migrate.cxx10
-rw-r--r--mod/mod-builds.cxx2
2 files changed, 6 insertions, 6 deletions
diff --git a/migrate/migrate.cxx b/migrate/migrate.cxx
index d33578a..ad5ea17 100644
--- a/migrate/migrate.cxx
+++ b/migrate/migrate.cxx
@@ -207,14 +207,14 @@ create (database& db, bool extra_only) const
// Register the data migration functions for the package database schema.
//
-template <odb::schema_version v>
+template <schema_version v>
using package_migration_entry_base =
- odb::data_migration_entry<v, LIBBREP_PACKAGE_SCHEMA_VERSION_BASE>;
+ data_migration_entry<v, LIBBREP_PACKAGE_SCHEMA_VERSION_BASE>;
-template <odb::schema_version v>
+template <schema_version v>
struct package_migration_entry: package_migration_entry_base<v>
{
- package_migration_entry (void (*f) (odb::database& db))
+ package_migration_entry (void (*f) (database& db))
: package_migration_entry_base<v> (f, "package") {}
};
@@ -222,7 +222,7 @@ struct package_migration_entry: package_migration_entry_base<v>
// data migration for this schema version.
//
static const package_migration_entry<9>
-package_migrate_v9 ([] (odb::database& db)
+package_migrate_v9 ([] (database& db)
{
// Add tenant objects.
//
diff --git a/mod/mod-builds.cxx b/mod/mod-builds.cxx
index 4d03987..fbdae4c 100644
--- a/mod/mod-builds.cxx
+++ b/mod/mod-builds.cxx
@@ -670,7 +670,7 @@ handle (request& rq, response& rs)
// caching will not be easy as the cached values depend on the filter
// form parameters.
//
- query q (
+ query<build_constrained_package> q (
package_query<build_constrained_package> (
params, tn, false /* archived */));