diff options
| author | Boris Kolpackov <boris@codesynthesis.com> | 2012-07-03 16:35:39 +0200 |
|---|---|---|
| committer | Boris Kolpackov <boris@codesynthesis.com> | 2012-07-03 16:35:39 +0200 |
| commit | e0dc0c1f005f36063e08c61de2754c4360103695 (patch) | |
| tree | 6a8669f81bab94b5a7bb65b561ba8e2a0c6e97f6 | |
| parent | 0c8561962a9651ad04715d944b849410a50fa56f (diff) | |
Add template qualifiers that are missing according to Clang 3.1
| -rw-r--r-- | odb/qt/smart-ptr/lazy-ptr.ixx | 16 | ||||
| -rw-r--r-- | odb/qt/smart-ptr/lazy-ptr.txx | 6 |
2 files changed, 12 insertions, 10 deletions
diff --git a/odb/qt/smart-ptr/lazy-ptr.ixx b/odb/qt/smart-ptr/lazy-ptr.ixx index 9241f74..5fd3b2b 100644 --- a/odb/qt/smart-ptr/lazy-ptr.ixx +++ b/odb/qt/smart-ptr/lazy-ptr.ixx @@ -129,7 +129,7 @@ template <class X> inline QLazySharedPointer<X> QLazySharedPointer<T>:: staticCast () const { - QLazySharedPointer c (p_.staticCast<X> ()); + QLazySharedPointer c (p_.template staticCast<X> ()); c.i_ = i_; return c; } @@ -139,7 +139,7 @@ template <class X> inline QLazySharedPointer<X> QLazySharedPointer<T>:: dynamicCast () const { - QLazySharedPointer<X> c (p_.dynamicCast<X> ()); + QLazySharedPointer<X> c (p_.template dynamicCast<X> ()); if (c) c.i_ = i_; @@ -152,7 +152,7 @@ template <class X> inline QLazySharedPointer<X> QLazySharedPointer<T>:: constCast () const { - QLazySharedPointer<X> c (p_.constCast<X> ()); + QLazySharedPointer<X> c (p_.template constCast<X> ()); c.i_ = i_; return c; } @@ -278,8 +278,9 @@ objectId () const { typedef typename odb::object_traits<T>::object_type object_type; - return p_ ? - odb::object_traits<object_type>::id (*p_) : i_.template object_id<O> (); + return p_ + ? odb::object_traits<object_type>::id (*p_) + : i_.template object_id<O> (); } // @@ -516,8 +517,9 @@ objectId () const QSharedPointer<T> sp (p_.toStrongRef ()); - return sp ? - odb::object_traits<object_type>::id (*sp) :i_.template object_id<O> (); + return sp + ? odb::object_traits<object_type>::id (*sp) + : i_.template object_id<O> (); } template <class T> diff --git a/odb/qt/smart-ptr/lazy-ptr.txx b/odb/qt/smart-ptr/lazy-ptr.txx index 25e3636..03b98bb 100644 --- a/odb/qt/smart-ptr/lazy-ptr.txx +++ b/odb/qt/smart-ptr/lazy-ptr.txx @@ -30,7 +30,7 @@ equal (const QLazySharedPointer<X>& r) const typedef typename odb::object_traits<X>::object_type object_type2; return i_.database () == r.i_.database () && - objectId<object_type1> () == r.objectId<object_type2> (); + objectId<object_type1> () == r.template objectId<object_type2> (); } // @@ -90,8 +90,8 @@ toStrongRef () const else { if (i_) - return QLazySharedPointer<T> (*i_.database (), - i_.template object_id<T> ()); + return QLazySharedPointer<T> ( + *i_.database (), i_.template object_id<T> ()); else return QLazySharedPointer<T> (); } |