aboutsummaryrefslogtreecommitdiff
path: root/common
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2015-02-11 16:17:00 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2015-02-11 16:17:00 +0200
commit647b604fb0d68d9921e1457ebaaf70a244e22d81 (patch)
treeb70bf832e33a250bed0d7153755953d4f6c673bb /common
parentf62e8a5c930eb975d209359c9da93ca7de179f1e (diff)
Add explicit template argument to lazy_ptr::object_id() call2.4.0
VC++11 does not support default function template arguments.
Diffstat (limited to 'common')
-rw-r--r--common/view/olv/driver.cxx12
1 files changed, 8 insertions, 4 deletions
diff --git a/common/view/olv/driver.cxx b/common/view/olv/driver.cxx
index b6483eb..f378f84 100644
--- a/common/view/olv/driver.cxx
+++ b/common/view/olv/driver.cxx
@@ -261,14 +261,16 @@ main (int argc, char* argv[])
{
transaction t (db->begin ());
view1a v (db->query_value<view1a> ());
- assert (v.o1->n == 123 && v.o1->o2.object_id () == o2->id);
+ // VC11
+ assert (v.o1->n == 123 && v.o1->o2.object_id<object2> () == o2->id);
t.commit ();
}
{
transaction t (db->begin ());
view1b v (db->query_value<view1b> ());
- assert (v.o1->n == 123 && v.o1->o2.object_id () == o2->id);
+ // VC11
+ assert (v.o1->n == 123 && v.o1->o2.object_id<object2> () == o2->id);
t.commit ();
}
@@ -292,14 +294,16 @@ main (int argc, char* argv[])
{
transaction t (db->begin ());
view2a v (db->query_value<view2a> ());
- assert (v.o3->n == 123 && v.o3->o4.object_id () == o4->id);
+ // VC11
+ assert (v.o3->n == 123 && v.o3->o4.object_id<object4> () == o4->id);
t.commit ();
}
{
transaction t (db->begin ());
view2b v (db->query_value<view2b> ());
- assert (v.o3->n == 123 && v.o3->o4.object_id () == o4->id);
+ // VC11
+ assert (v.o3->n == 123 && v.o3->o4.object_id<object4> () == o4->id);
t.commit ();
}
}