Merge remote-tracking branch 'origin/master'

Cython/Includes/libcpp/complex.pxd

@@ -39,63 +39,63 @@ cdef extern from "<complex>" namespace "std" nogil:
         void imag(T)
 
     # Return real part
-    T real(complex[T]&)
+    T real[T](complex[T]&)
     long double real(long double)
     double real(double)
     float real(float)
 
     # Return imaginary part
-    T imag(complex[T]&)
+    T imag[T](complex[T]&)
     long double imag(long double)
     double imag(double)
     float imag(float)
 
-    T abs(complex[T]&)
-    T arg(complex[T]&)
+    T abs[T](complex[T]&)
+    T arg[T](complex[T]&)
     long double arg(long double)
     double arg(double)
     float arg(float)
 
-    T norm(complex[T])
+    T norm[T](complex[T])
     long double norm(long double)
     double norm(double)
     float norm(float)
 
-    complex[T] conj(complex[T]&)
+    complex[T] conj[T](complex[T]&)
     complex[long double] conj(long double)
     complex[double] conj(double)
     complex[float] conj(float)
 
-    complex[T] proj(complex[T])
+    complex[T] proj[T](complex[T])
     complex[long double] proj(long double)
     complex[double] proj(double)
     complex[float] proj(float)
 
-    complex[T] polar(T&, T&)
-    complex[T] ploar(T&)
+    complex[T] polar[T](T&, T&)
+    complex[T] ploar[T](T&)
 
-    complex[T] exp(complex[T]&)
-    complex[T] log(complex[T]&)
-    complex[T] log10(complex[T]&)
+    complex[T] exp[T](complex[T]&)
+    complex[T] log[T](complex[T]&)
+    complex[T] log10[T](complex[T]&)
 
-    complex[T] pow(complex[T]&, complex[T]&)
-    complex[T] pow(complex[T]&, T&)
-    complex[T] pow(T&, complex[T]&)
+    complex[T] pow[T](complex[T]&, complex[T]&)
+    complex[T] pow[T](complex[T]&, T&)
+    complex[T] pow[T](T&, complex[T]&)
     # There are some promotion versions too
 
-    complex[T] sqrt(complex[T]&)
+    complex[T] sqrt[T](complex[T]&)
 
-    complex[T] sin(complex[T]&)
-    complex[T] cos(complex[T]&)
-    complex[T] tan(complex[T]&)
-    complex[T] asin(complex[T]&)
-    complex[T] acos(complex[T]&)
-    complex[T] atan(complex[T]&)
+    complex[T] sin[T](complex[T]&)
+    complex[T] cos[T](complex[T]&)
+    complex[T] tan[T](complex[T]&)
+    complex[T] asin[T](complex[T]&)
+    complex[T] acos[T](complex[T]&)
+    complex[T] atan[T](complex[T]&)
 
-    complex[T] sinh(complex[T]&)
-    complex[T] cosh(complex[T]&)
-    complex[T] tanh(complex[T]&)
+    complex[T] sinh[T](complex[T]&)
+    complex[T] cosh[T](complex[T]&)
+    complex[T] tanh[T](complex[T]&)
 
-    complex[T] asinh(complex[T]&)
-    complex[T] acosh(complex[T]&)
-    complex[T] atanh(complex[T]&)
+    complex[T] asinh[T](complex[T]&)
+    complex[T] acosh[T](complex[T]&)
+    complex[T] atanh[T](complex[T]&)

tests/run/libcpp_all.pyx

@@ -12,6 +12,7 @@ cimport libcpp.queue
 cimport libcpp.set
 cimport libcpp.stack
 cimport libcpp.vector
+cimport libcpp.complex
 
 from libcpp.deque  cimport *
 from libcpp.list   cimport *
@@ -21,6 +22,7 @@ from libcpp.queue  cimport *
 from libcpp.set    cimport *
 from libcpp.stack  cimport *
 from libcpp.vector cimport *
+from libcpp.complex cimport *
 
 cdef libcpp.deque.deque[int]   d1 = deque[int]()
 cdef libcpp.list.list[int]     l1 = list[int]()