diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2012-07-03 16:35:38 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2012-07-03 16:35:38 +0200 |
| commit | 801cee821949ccafd644b06364c0a2c01148e63a (patch) | |
| tree | d67052b766e6e35021694fab2473f88c643438d7 /odb/tr1 | |
| parent | a5a93dcba35e79bfa247d54991a59f389203507e (diff) | |
Add template qualifiers that are missing according to Clang 3.1
Diffstat (limited to 'odb/tr1')
| -rw-r--r-- | odb/tr1/lazy-pointer-traits.hxx | 2 | ||||
| -rw-r--r-- | odb/tr1/lazy-ptr.ixx | 8 | ||||
| -rw-r--r-- | odb/tr1/lazy-ptr.txx | 5 |
3 files changed, 10 insertions, 5 deletions
diff --git a/odb/tr1/lazy-pointer-traits.hxx b/odb/tr1/lazy-pointer-traits.hxx index 6fd1fbf..aefab8c 100644 --- a/odb/tr1/lazy-pointer-traits.hxx +++ b/odb/tr1/lazy-pointer-traits.hxx @@ -33,7 +33,7 @@ namespace odb static typename object_traits<O>::id_type object_id (const pointer_type& p) { - return p.object_id<O> (); + return p.template object_id<O> (); } }; diff --git a/odb/tr1/lazy-ptr.ixx b/odb/tr1/lazy-ptr.ixx index 2fb76a9..a29eaad 100644 --- a/odb/tr1/lazy-ptr.ixx +++ b/odb/tr1/lazy-ptr.ixx @@ -329,7 +329,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> @@ -593,7 +595,9 @@ namespace odb typedef typename object_traits<T>::object_type object_type; std::tr1::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> diff --git a/odb/tr1/lazy-ptr.txx b/odb/tr1/lazy-ptr.txx index 3299ec2..65400f8 100644 --- a/odb/tr1/lazy-ptr.txx +++ b/odb/tr1/lazy-ptr.txx @@ -38,7 +38,7 @@ namespace odb typedef typename object_traits<Y>::object_type object_type2; return i_.database () == r.i_.database () && - object_id<object_type1> () == r.object_id<object_type2> (); + object_id<object_type1> () == r.template object_id<object_type2> (); } // @@ -61,7 +61,8 @@ namespace odb else { if (i_) - return lazy_shared_ptr<T> (*i_.database (), i_.object_id<T> ()); + return lazy_shared_ptr<T> ( + *i_.database (), i_.template object_id<T> ()); else return lazy_shared_ptr<T> (); } |