Merge pull request #149 from wolfv/rename_void

rename VOID to XFVOID to avoid collisions with TBB
xtensor-stack · Mar 19, 2020 · 0a9aee8 · 0a9aee8
2 parents b31ac78 + 42b308e
commit 0a9aee8
Show file tree

Hide file tree

Showing 33 changed files with 73 additions and 73 deletions.
diff --git a/include/xflens/cxxlapack/interface/isnan.h b/include/xflens/cxxlapack/interface/isnan.h
@@ -36,7 +36,7 @@
 #include <complex>
 
 namespace cxxlapack {
-template <typename VOID>
+template <typename XFLENS_VOID>
 bool
 isnan(float                 sin);
 

diff --git a/include/xflens/cxxlapack/interface/isnan.tcc b/include/xflens/cxxlapack/interface/isnan.tcc
@@ -39,7 +39,7 @@
 
 namespace cxxlapack {
 
-template <typename VOID>
+template <typename XFLENS_VOID>
 bool
 isnan(float                 sin)
 {

diff --git a/include/xflens/cxxlapack/interface/labad.h b/include/xflens/cxxlapack/interface/labad.h
@@ -37,11 +37,11 @@
 
 namespace cxxlapack {
 
-template <typename VOID=void>
+template <typename XFLENS_VOID=void>
     void
     labad(float  &small, float  &large);
 
-template <typename VOID=void>
+template <typename XFLENS_VOID=void>
     void
     labad(double &small, double &large);
 

diff --git a/include/xflens/cxxlapack/interface/labad.tcc b/include/xflens/cxxlapack/interface/labad.tcc
@@ -39,7 +39,7 @@
 
 namespace cxxlapack {
 
-template <typename VOID>
+template <typename XFLENS_VOID>
 void
 labad(float &small, float &large)
 {
@@ -49,7 +49,7 @@ labad(float &small, float &large)
                         &large);
 }
 
-template <typename VOID>
+template <typename XFLENS_VOID>
 void
 labad(double &small, double &large)
 {

diff --git a/include/xflens/cxxlapack/interface/lae2.h b/include/xflens/cxxlapack/interface/lae2.h
@@ -37,15 +37,15 @@
 
 namespace cxxlapack {
 
-template <typename VOID=void>
+template <typename XFLENS_VOID=void>
 void
     lae2(float                 a,
          float                 b,
          float                 c,
          float                 &rt1,
          float                 &rt2);
 
-template <typename VOID=void>
+template <typename XFLENS_VOID=void>
 void
     lae2(double                a,
          double                b,

diff --git a/include/xflens/cxxlapack/interface/lae2.tcc b/include/xflens/cxxlapack/interface/lae2.tcc
@@ -39,7 +39,7 @@
 
 namespace cxxlapack {
 
-template <typename VOID>
+template <typename XFLENS_VOID>
 void
 lae2(float                 a,
      float                 b,
@@ -56,7 +56,7 @@ lae2(float                 a,
                        &rt2);
 }
 
-template <typename VOID>
+template <typename XFLENS_VOID>
 void
 lae2(double                a,
      double                b,

diff --git a/include/xflens/cxxlapack/interface/laesy.h b/include/xflens/cxxlapack/interface/laesy.h
@@ -37,7 +37,7 @@
 
 namespace cxxlapack {
 
-template <typename VOID=void>
+template <typename XFLENS_VOID=void>
     void
     laesy(std::complex<float >  a,
           std::complex<float >  b,
@@ -48,7 +48,7 @@ template <typename VOID=void>
           std::complex<float >  &cs1,
           std::complex<float >  &sn1);
 
-template <typename VOID=void>
+template <typename XFLENS_VOID=void>
     void
     laesy(std::complex<double>  a,
           std::complex<double>  b,

diff --git a/include/xflens/cxxlapack/interface/laesy.tcc b/include/xflens/cxxlapack/interface/laesy.tcc
@@ -39,7 +39,7 @@
 
 namespace cxxlapack {
 
-template <typename VOID>
+template <typename XFLENS_VOID>
 void
 laesy(std::complex<float >  a,
       std::complex<float >  b,
@@ -64,7 +64,7 @@ laesy(std::complex<float >  a,
 
 }
 
-template <typename VOID>
+template <typename XFLENS_VOID>
 void
 laesy(std::complex<double>  a,
       std::complex<double>  b,

diff --git a/include/xflens/cxxlapack/interface/laev2.h b/include/xflens/cxxlapack/interface/laev2.h
@@ -37,7 +37,7 @@
 
 namespace cxxlapack {
 
-template <typename VOID=void>
+template <typename XFLENS_VOID=void>
     void
     laev2(float                 a,
           float                 b,
@@ -48,7 +48,7 @@ template <typename VOID=void>
           float                 &sn1);
 
 
-template <typename VOID=void>
+template <typename XFLENS_VOID=void>
     void
     laev2(double                a,
           double                b,
@@ -58,7 +58,7 @@ template <typename VOID=void>
           double                &cs1,
           double                &sn1);
 
-template <typename VOID=void>
+template <typename XFLENS_VOID=void>
     void
     laev2(std::complex<float >  a,
           std::complex<float >  b,
@@ -68,7 +68,7 @@ template <typename VOID=void>
           float                 &cs1,
           std::complex<float >  &sn1);
 
-template <typename VOID=void>
+template <typename XFLENS_VOID=void>
     void
     laev2(std::complex<double>  a,
           std::complex<double>  b,

diff --git a/include/xflens/cxxlapack/interface/laev2.tcc b/include/xflens/cxxlapack/interface/laev2.tcc
@@ -39,7 +39,7 @@
 
 namespace cxxlapack {
 
-template <typename VOID>
+template <typename XFLENS_VOID>
 void
 laev2(float                 a,
       float                 b,
@@ -61,7 +61,7 @@ laev2(float                 a,
 }
 
 
-template <typename VOID>
+template <typename XFLENS_VOID>
 void
 laev2(double                a,
       double                b,
@@ -82,7 +82,7 @@ laev2(double                a,
                         &sn1);
 }
 
-template <typename VOID>
+template <typename XFLENS_VOID>
 void
 laev2(std::complex<float >  a,
       std::complex<float >  b,
@@ -103,7 +103,7 @@ laev2(std::complex<float >  a,
                         reinterpret_cast<float  *>(&sn1));
 }
 
-template <typename VOID>
+template <typename XFLENS_VOID>
 void
 laev2(std::complex<double>  a,
       std::complex<double>  b,

diff --git a/include/xflens/cxxlapack/interface/lags2.h b/include/xflens/cxxlapack/interface/lags2.h
@@ -37,7 +37,7 @@
 
 namespace cxxlapack {
 
-template <typename VOID=void>
+template <typename XFLENS_VOID=void>
     void
     lags2(bool                  upper,
           float                 a1,
@@ -53,7 +53,7 @@ template <typename VOID=void>
           float                 &csq,
           float                 &snq);
 
-template <typename VOID=void>
+template <typename XFLENS_VOID=void>
     void
     lags2(bool                  upper,
           double                a1,
@@ -69,7 +69,7 @@ template <typename VOID=void>
           double                &csq,
           double                &snq);
 
-template <typename VOID=void>
+template <typename XFLENS_VOID=void>
     void
     lags2(bool                  upper,
           float                 a1,
@@ -85,7 +85,7 @@ template <typename VOID=void>
           float                 &csq,
           std::complex<float >  &snq);
 
-template <typename VOID=void>
+template <typename XFLENS_VOID=void>
     void
     lags2(bool                  upper,
           double                a1,

diff --git a/include/xflens/cxxlapack/interface/lags2.tcc b/include/xflens/cxxlapack/interface/lags2.tcc
@@ -39,7 +39,7 @@
 
 namespace cxxlapack {
 
-template <typename VOID>
+template <typename XFLENS_VOID>
 void
 lags2(bool                  upper,
       float                 a1,
@@ -75,7 +75,7 @@ lags2(bool                  upper,
 }
 
 
-template <typename VOID>
+template <typename XFLENS_VOID>
 void
 lags2(bool                  upper,
       double                a1,
@@ -110,7 +110,7 @@ lags2(bool                  upper,
 
 }
 
-template <typename VOID>
+template <typename XFLENS_VOID>
 void
 lags2(bool                  upper,
       float                 a1,
@@ -146,7 +146,7 @@ lags2(bool                  upper,
 
 }
 
-template <typename VOID>
+template <typename XFLENS_VOID>
 void
 lags2(bool                  upper,
       double                a1,

diff --git a/include/xflens/cxxlapack/interface/laisnan.h b/include/xflens/cxxlapack/interface/laisnan.h
@@ -37,12 +37,12 @@
 
 namespace cxxlapack {
 
-template <typename VOID>
+template <typename XFLENS_VOID>
 bool
     laisnan(float                  sin1,
             float                  sin2);
 
-template <typename VOID>
+template <typename XFLENS_VOID>
 bool
     laisnan(double                 din1,
             double                 din2);

diff --git a/include/xflens/cxxlapack/interface/laisnan.tcc b/include/xflens/cxxlapack/interface/laisnan.tcc
@@ -39,7 +39,7 @@
 
 namespace cxxlapack {
 
-template <typename VOID>
+template <typename XFLENS_VOID>
 bool
 laisnan(float                  sin1,
         float                  sin2)
@@ -50,7 +50,7 @@ laisnan(float                  sin1,
                                  &sin2);
 }
 
-template <typename VOID>
+template <typename XFLENS_VOID>
 bool
 laisnan(double                 din1,
         double                 din2)

diff --git a/include/xflens/cxxlapack/interface/lamch.tcc b/include/xflens/cxxlapack/interface/lamch.tcc
@@ -39,7 +39,7 @@
 
 namespace cxxlapack {
 
-template <typename VOID>
+template <typename XFLENS_VOID>
 void
 lamch_(char c, double &value)
 {

diff --git a/include/xflens/cxxlapack/interface/lanv2.h b/include/xflens/cxxlapack/interface/lanv2.h
@@ -37,7 +37,7 @@
 
 namespace cxxlapack {
 
-template <typename VOID=void>
+template <typename XFLENS_VOID=void>
     void
     lanv2(float    &a,
           float    &b,
@@ -50,7 +50,7 @@ template <typename VOID=void>
           float    &cs,
           float    &sn);
 
-template <typename VOID=void>
+template <typename XFLENS_VOID=void>
     void
     lanv2(double   &a,
           double   &b,

diff --git a/include/xflens/cxxlapack/interface/lanv2.tcc b/include/xflens/cxxlapack/interface/lanv2.tcc
@@ -39,7 +39,7 @@
 
 namespace cxxlapack {
 
-template <typename VOID>
+template <typename XFLENS_VOID>
 void
 lanv2(float    &a,
       float    &b,
@@ -66,7 +66,7 @@ lanv2(float    &a,
                         &sn);
 }
 
-template <typename VOID>
+template <typename XFLENS_VOID>
 void
 lanv2(double   &a,
       double   &b,

diff --git a/include/xflens/cxxlapack/interface/lapy2.h b/include/xflens/cxxlapack/interface/lapy2.h
@@ -37,11 +37,11 @@
 
 namespace cxxlapack {
 
-template <typename VOID=void>
+template <typename XFLENS_VOID=void>
     float
     lapy2(float x, float y);
 
-template <typename VOID=void>
+template <typename XFLENS_VOID=void>
     double
     lapy2(double x, double y);
 

diff --git a/include/xflens/cxxlapack/interface/lapy2.tcc b/include/xflens/cxxlapack/interface/lapy2.tcc
@@ -39,7 +39,7 @@
 
 namespace cxxlapack {
 
-template <typename VOID>
+template <typename XFLENS_VOID>
 float
 lapy2(float x, float y)
 {
@@ -49,7 +49,7 @@ lapy2(float x, float y)
 }
 
 
-template <typename VOID>
+template <typename XFLENS_VOID>
 double
 lapy2(double x, double y)
 {

diff --git a/include/xflens/cxxlapack/interface/lapy3.h b/include/xflens/cxxlapack/interface/lapy3.h
@@ -37,11 +37,11 @@
 
 namespace cxxlapack {
 
-template <typename VOID=void>
+template <typename XFLENS_VOID=void>
     float
     lapy3(float x, float y, float z);
 
-template <typename VOID=void>
+template <typename XFLENS_VOID=void>
     double
     lapy3(double x, double y, double z);