aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2012-12-12 11:45:03 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2012-12-12 11:45:27 +0200
commit65643aa0fa2ee04830ebe52f90a4813089d51516 (patch)
tree07fb0d1f5bc56d52d1057a57c9c7614e3e697234
parentf995dcc30766afe58d212131efb6478c2dbfd7b9 (diff)
Don't use 0 to initialize std::function
This doesn't work on VC++ 11.
-rw-r--r--odb/database.ixx4
1 files changed, 3 insertions, 1 deletions
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::