From 65643aa0fa2ee04830ebe52f90a4813089d51516 Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Wed, 12 Dec 2012 11:45:03 +0200 Subject: Don't use 0 to initialize std::function This doesn't work on VC++ 11. --- odb/database.ixx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/odb/database.ixx b/odb/database.ixx index 2f39a61..1954f89 100644 --- a/odb/database.ixx +++ b/odb/database.ixx @@ -48,7 +48,9 @@ namespace odb if (i == query_factory_map_.end ()) i = query_factory_map_.find (""); // Wildcard factory. - return i != query_factory_map_.end () ? i->second : 0; + return i != query_factory_map_.end () + ? i->second + : database::query_factory_type (); } inline void database:: -- cgit v1.1