From 2fbdfa4d3df7c09d82bd2c5685420eee5d6dea18 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Tue, 30 Oct 2018 17:40:39 +0300 Subject: Fix to compile with g++ 4.9 --- migrate/migrate.cxx | 10 +++++----- mod/mod-builds.cxx | 2 +- 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 +template using package_migration_entry_base = - odb::data_migration_entry; + data_migration_entry; -template +template struct package_migration_entry: package_migration_entry_base { - package_migration_entry (void (*f) (odb::database& db)) + package_migration_entry (void (*f) (database& db)) : package_migration_entry_base (f, "package") {} }; @@ -222,7 +222,7 @@ struct package_migration_entry: package_migration_entry_base // 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 q ( package_query ( params, tn, false /* archived */)); -- cgit v1.1