Skip to content

Commit 0a9aee8

Browse files
JohanMabilleJohanMabille
authored
Merge pull request #149 from wolfv/rename_void
rename VOID to XFVOID to avoid collisions with TBB
2 parents b31ac78 + 42b308e commit 0a9aee8

33 files changed

+73
-73
lines changed

‎include/xflens/cxxlapack/interface/isnan.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
#include <complex>
3737

3838
namespace cxxlapack {
39-
template <typename VOID>
39+
template <typename XFLENS_VOID>
4040
bool
4141
isnan(float sin);
4242

‎include/xflens/cxxlapack/interface/isnan.tcc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
namespace cxxlapack {
4141

42-
template <typename VOID>
42+
template <typename XFLENS_VOID>
4343
bool
4444
isnan(float sin)
4545
{

‎include/xflens/cxxlapack/interface/labad.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,11 @@
3737

3838
namespace cxxlapack {
3939

40-
template <typename VOID=void>
40+
template <typename XFLENS_VOID=void>
4141
void
4242
labad(float &small, float &large);
4343

44-
template <typename VOID=void>
44+
template <typename XFLENS_VOID=void>
4545
void
4646
labad(double &small, double &large);
4747

‎include/xflens/cxxlapack/interface/labad.tcc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
namespace cxxlapack {
4141

42-
template <typename VOID>
42+
template <typename XFLENS_VOID>
4343
void
4444
labad(float &small, float &large)
4545
{
@@ -49,7 +49,7 @@ labad(float &small, float &large)
4949
&large);
5050
}
5151

52-
template <typename VOID>
52+
template <typename XFLENS_VOID>
5353
void
5454
labad(double &small, double &large)
5555
{

‎include/xflens/cxxlapack/interface/lae2.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@
3737

3838
namespace cxxlapack {
3939

40-
template <typename VOID=void>
40+
template <typename XFLENS_VOID=void>
4141
void
4242
lae2(float a,
4343
float b,
4444
float c,
4545
float &rt1,
4646
float &rt2);
4747

48-
template <typename VOID=void>
48+
template <typename XFLENS_VOID=void>
4949
void
5050
lae2(double a,
5151
double b,

‎include/xflens/cxxlapack/interface/lae2.tcc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
namespace cxxlapack {
4141

42-
template <typename VOID>
42+
template <typename XFLENS_VOID>
4343
void
4444
lae2(float a,
4545
float b,
@@ -56,7 +56,7 @@ lae2(float a,
5656
&rt2);
5757
}
5858

59-
template <typename VOID>
59+
template <typename XFLENS_VOID>
6060
void
6161
lae2(double a,
6262
double b,

‎include/xflens/cxxlapack/interface/laesy.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
namespace cxxlapack {
3939

40-
template <typename VOID=void>
40+
template <typename XFLENS_VOID=void>
4141
void
4242
laesy(std::complex<float > a,
4343
std::complex<float > b,
@@ -48,7 +48,7 @@ template <typename VOID=void>
4848
std::complex<float > &cs1,
4949
std::complex<float > &sn1);
5050

51-
template <typename VOID=void>
51+
template <typename XFLENS_VOID=void>
5252
void
5353
laesy(std::complex<double> a,
5454
std::complex<double> b,

‎include/xflens/cxxlapack/interface/laesy.tcc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
namespace cxxlapack {
4141

42-
template <typename VOID>
42+
template <typename XFLENS_VOID>
4343
void
4444
laesy(std::complex<float > a,
4545
std::complex<float > b,
@@ -64,7 +64,7 @@ laesy(std::complex<float > a,
6464

6565
}
6666

67-
template <typename VOID>
67+
template <typename XFLENS_VOID>
6868
void
6969
laesy(std::complex<double> a,
7070
std::complex<double> b,

‎include/xflens/cxxlapack/interface/laev2.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737

3838
namespace cxxlapack {
3939

40-
template <typename VOID=void>
40+
template <typename XFLENS_VOID=void>
4141
void
4242
laev2(float a,
4343
float b,
@@ -48,7 +48,7 @@ template <typename VOID=void>
4848
float &sn1);
4949

5050

51-
template <typename VOID=void>
51+
template <typename XFLENS_VOID=void>
5252
void
5353
laev2(double a,
5454
double b,
@@ -58,7 +58,7 @@ template <typename VOID=void>
5858
double &cs1,
5959
double &sn1);
6060

61-
template <typename VOID=void>
61+
template <typename XFLENS_VOID=void>
6262
void
6363
laev2(std::complex<float > a,
6464
std::complex<float > b,
@@ -68,7 +68,7 @@ template <typename VOID=void>
6868
float &cs1,
6969
std::complex<float > &sn1);
7070

71-
template <typename VOID=void>
71+
template <typename XFLENS_VOID=void>
7272
void
7373
laev2(std::complex<double> a,
7474
std::complex<double> b,

‎include/xflens/cxxlapack/interface/laev2.tcc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939

4040
namespace cxxlapack {
4141

42-
template <typename VOID>
42+
template <typename XFLENS_VOID>
4343
void
4444
laev2(float a,
4545
float b,
@@ -61,7 +61,7 @@ laev2(float a,
6161
}
6262

6363

64-
template <typename VOID>
64+
template <typename XFLENS_VOID>
6565
void
6666
laev2(double a,
6767
double b,
@@ -82,7 +82,7 @@ laev2(double a,
8282
&sn1);
8383
}
8484

85-
template <typename VOID>
85+
template <typename XFLENS_VOID>
8686
void
8787
laev2(std::complex<float > a,
8888
std::complex<float > b,
@@ -103,7 +103,7 @@ laev2(std::complex<float > a,
103103
reinterpret_cast<float *>(&sn1));
104104
}
105105

106-
template <typename VOID>
106+
template <typename XFLENS_VOID>
107107
void
108108
laev2(std::complex<double> a,
109109
std::complex<double> b,

0 commit comments

Comments
 (0)