aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2013-01-09 16:12:03 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2013-01-09 16:12:03 +0200
commitaba0b05c3fd52036f95985a7088623a950c2b968 (patch)
tree1be0ebcb6317f39b12bbb43a7082699c17f68149
parent3207a2aeba889f45cd5af53ce6070a66521e20b8 (diff)
Work around "changes meaning" error in older GCC
-rw-r--r--odb/database.hxx8
1 files changed, 4 insertions, 4 deletions
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<void (const char*, connection&)>
+ std::function<void (const char*, connection_type&)>
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;