From aba0b05c3fd52036f95985a7088623a950c2b968 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Wed, 9 Jan 2013 16:12:03 +0200 Subject: Work around "changes meaning" error in older GCC --- odb/database.hxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'odb/database.hxx') diff --git a/odb/database.hxx b/odb/database.hxx index 506245f..2614e3f 100644 --- a/odb/database.hxx +++ b/odb/database.hxx @@ -263,12 +263,14 @@ namespace odb // Prepared query factory. // public: + typedef odb::connection connection_type; + #ifdef ODB_CXX11 typedef - std::function + std::function query_factory_type; #else - typedef void (*query_factory_type) (const char*, connection&); + typedef void (*query_factory_type) (const char*, connection_type&); #endif void @@ -329,8 +331,6 @@ namespace odb database& operator= (const database&); protected: - typedef odb::connection connection_type; - virtual connection_type* connection_ () = 0; -- cgit v1.1