aboutsummaryrefslogtreecommitdiff
path: root/odb/lazy-ptr.ixx
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2012-07-03 16:35:38 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2012-07-03 16:35:38 +0200
commit801cee821949ccafd644b06364c0a2c01148e63a (patch)
treed67052b766e6e35021694fab2473f88c643438d7 /odb/lazy-ptr.ixx
parenta5a93dcba35e79bfa247d54991a59f389203507e (diff)
Add template qualifiers that are missing according to Clang 3.1
Diffstat (limited to 'odb/lazy-ptr.ixx')
-rw-r--r--odb/lazy-ptr.ixx18
1 files changed, 13 insertions, 5 deletions
diff --git a/odb/lazy-ptr.ixx b/odb/lazy-ptr.ixx
index 19150ef..08f3e5e 100644
--- a/odb/lazy-ptr.ixx
+++ b/odb/lazy-ptr.ixx
@@ -180,7 +180,9 @@ namespace odb
{
typedef typename object_traits<T>::object_type object_type;
- return p_ ? object_traits<object_type>::id (*p_) : i_.object_id<O> ();
+ return p_
+ ? object_traits<object_type>::id (*p_)
+ : i_.template object_id<O> ();
}
template <class T>
@@ -460,7 +462,7 @@ namespace odb
return p_.get () != 0
? object_traits<object_type>::id (*p_)
- : i_.object_id<O> ();
+ : i_.template object_id<O> ();
}
template <class T>
@@ -768,7 +770,9 @@ namespace odb
{
typedef typename object_traits<T>::object_type object_type;
- return p_ ? object_traits<object_type>::id (*p_) : i_.object_id<O> ();
+ return p_
+ ? object_traits<object_type>::id (*p_)
+ : i_.template object_id<O> ();
}
template <class T, class D>
@@ -1308,7 +1312,9 @@ namespace odb
{
typedef typename object_traits<T>::object_type object_type;
- return p_ ? object_traits<object_type>::id (*p_) : i_.object_id<O> ();
+ return p_
+ ? object_traits<object_type>::id (*p_)
+ : i_.template object_id<O> ();
}
template <class T>
@@ -1601,7 +1607,9 @@ namespace odb
typedef typename object_traits<T>::object_type object_type;
std::shared_ptr<T> sp (p_.lock ());
- return sp ? object_traits<object_type>::id (*sp) : i_.object_id<O> ();
+ return sp
+ ? object_traits<object_type>::id (*sp)
+ : i_.template object_id<O> ();
}
template <class T>