diff options
| -rw-r--r-- | odb/lazy-pointer-traits.hxx | 8 | ||||
| -rw-r--r-- | odb/lazy-ptr.ixx | 18 | ||||
| -rw-r--r-- | odb/lazy-ptr.txx | 9 | ||||
| -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 |
6 files changed, 32 insertions, 18 deletions
diff --git a/odb/lazy-pointer-traits.hxx b/odb/lazy-pointer-traits.hxx index 5273db1..f284ba0 100644 --- a/odb/lazy-pointer-traits.hxx +++ b/odb/lazy-pointer-traits.hxx @@ -34,7 +34,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> (); } }; @@ -59,7 +59,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> (); } }; @@ -85,7 +85,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> (); } }; @@ -110,7 +110,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/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> diff --git a/odb/lazy-ptr.txx b/odb/lazy-ptr.txx index fdc304b..039448a 100644 --- a/odb/lazy-ptr.txx +++ b/odb/lazy-ptr.txx @@ -36,7 +36,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> (); } #ifdef ODB_CXX11 @@ -73,7 +73,7 @@ namespace odb typedef typename object_traits<T1>::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> (); } // @@ -108,7 +108,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> (); } // @@ -131,7 +131,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> (); } 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> (); } |