Qualify calls to template member functions in invoke_matching.

TallJimbo · TallJimbo · commit b46dfd906433 · 2013-03-19T11:38:08.000-04:00
This is necessary to avoid a bug in which a template struct from another
namespace can be confused with the member function by the parser
(see gcc bug 55576; it's apparently a defect in the C++98 standard).
diff --git a/boost/numpy/invoke_matching.hpp b/boost/numpy/invoke_matching.hpp
@@ -44,7 +44,7 @@ struct dtype_template_invoker
   {
     if (dtype::get_builtin<T>() == m_dtype) 
     {
-      m_func.template apply<T>();
+      m_func.Function::template apply<T>();
       throw dtype_template_match_found();
     }
   }
@@ -66,7 +66,7 @@ struct dtype_template_invoker< boost::reference_wrapper<Function> >
   {
     if (dtype::get_builtin<T>() == m_dtype) 
     {
-      m_func.template apply<T>();
+      m_func.Function::template apply<T>();
       throw dtype_template_match_found();
     }
   }
@@ -87,7 +87,7 @@ struct nd_template_invoker
   {
     if (m_nd == N) 
     {
-      m_func.template apply<N>();
+      m_func.Function::template apply<N>();
       throw nd_template_match_found();
     }
   }
@@ -107,7 +107,7 @@ struct nd_template_invoker< boost::reference_wrapper<Function> >
   {
     if (m_nd == N) 
     {
-      m_func.template apply<N>();
+      m_func.Function::template apply<N>();
       throw nd_template_match_found();
     }
   }
@@ -148,7 +148,7 @@ template <typename T, typename Function>
 struct array_template_invoker_wrapper_2 
 {
   template <int N>
-  void apply() const { m_func.template apply<T,N>();}
+  void apply() const { m_func.Function::template apply<T,N>();}
   array_template_invoker_wrapper_2(Function & func) : m_func(func) {}
 
 private:

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ struct dtype_template_invoker`
`44`	`44`	`{`
`45`	`45`	`if (dtype::get_builtin<T>() == m_dtype)`
`46`	`46`	`{`
`47`		`- m_func.template apply<T>();`
	`47`	`+ m_func.Function::template apply<T>();`
`48`	`48`	`throw dtype_template_match_found();`
`49`	`49`	`}`
`50`	`50`	`}`
`@@ -66,7 +66,7 @@ struct dtype_template_invoker< boost::reference_wrapper<Function> >`
`66`	`66`	`{`
`67`	`67`	`if (dtype::get_builtin<T>() == m_dtype)`
`68`	`68`	`{`
`69`		`- m_func.template apply<T>();`
	`69`	`+ m_func.Function::template apply<T>();`
`70`	`70`	`throw dtype_template_match_found();`
`71`	`71`	`}`
`72`	`72`	`}`
`@@ -87,7 +87,7 @@ struct nd_template_invoker`
`87`	`87`	`{`
`88`	`88`	`if (m_nd == N)`
`89`	`89`	`{`
`90`		`- m_func.template apply<N>();`
	`90`	`+ m_func.Function::template apply<N>();`
`91`	`91`	`throw nd_template_match_found();`
`92`	`92`	`}`
`93`	`93`	`}`
`@@ -107,7 +107,7 @@ struct nd_template_invoker< boost::reference_wrapper<Function> >`
`107`	`107`	`{`
`108`	`108`	`if (m_nd == N)`
`109`	`109`	`{`
`110`		`- m_func.template apply<N>();`
	`110`	`+ m_func.Function::template apply<N>();`
`111`	`111`	`throw nd_template_match_found();`
`112`	`112`	`}`
`113`	`113`	`}`
`@@ -148,7 +148,7 @@ template <typename T, typename Function>`
`148`	`148`	`struct array_template_invoker_wrapper_2`
`149`	`149`	`{`
`150`	`150`	`template <int N>`
`151`		`- void apply() const { m_func.template apply<T,N>();}`
	`151`	`+ void apply() const { m_func.Function::template apply<T,N>();}`
`152`	`152`	`array_template_invoker_wrapper_2(Function & func) : m_func(func) {}`
`153`	`153`
`154`	`154`	`private:`