Add template qualifiers that are missing according to Clang 3.1

3 files changed, 10 insertions, 5 deletions

diff --git a/odb/boost/smart-ptr/lazy-pointer-traits.hxx b/odb/boost/smart-ptr/lazy-pointer-traits.hxx
index d616824..50fe7f4 100644
--- a/odb/boost/smart-ptr/lazy-pointer-traits.hxx
+++ b/odb/boost/smart-ptr/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/boost/smart-ptr/lazy-ptr.ixx b/odb/boost/smart-ptr/lazy-ptr.ixx
index ecdc2a9..4b9f761 100644
--- a/odb/boost/smart-ptr/lazy-ptr.ixx
+++ b/odb/boost/smart-ptr/lazy-ptr.ixx
@@ -366,7 +366,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>
@@ -630,7 +632,9 @@ namespace odb
       typedef typename object_traits<T>::object_type object_type;
 
       ::boost::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/boost/smart-ptr/lazy-ptr.txx b/odb/boost/smart-ptr/lazy-ptr.txx
index aec409b..ecd3d6d 100644
--- a/odb/boost/smart-ptr/lazy-ptr.txx
+++ b/odb/boost/smart-ptr/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> ();
       }