Skip to content

Commit 11fdbce

Browse files
authored
Merge pull request #204 from BioDataAnalysis/bda_minor_msvc_fix
labad: Renamed 'small' to 'smallv' to avoid problems with define in rpcndr.h on MSVC
2 parents 7ceb791 + d88ebec commit 11fdbce

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

include/xflens/cxxlapack/interface/labad.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@ namespace cxxlapack {
3939

4040
template <typename XFLENS_VOID=void>
4141
void
42-
labad(float &small, float &large);
42+
labad(float &smallv, float &largev);
4343

4444
template <typename XFLENS_VOID=void>
4545
void
46-
labad(double &small, double &large);
46+
labad(double &smallv, double &largev);
4747

4848
} // namespace cxxlapack
4949

include/xflens/cxxlapack/interface/labad.tcc

+6-6
Original file line numberDiff line numberDiff line change
@@ -41,22 +41,22 @@ namespace cxxlapack {
4141

4242
template <typename XFLENS_VOID>
4343
void
44-
labad(float &small, float &large)
44+
labad(float &smallv, float &largev)
4545
{
4646
CXXLAPACK_DEBUG_OUT("slabad");
4747

48-
LAPACK_IMPL(slabad)(&small,
49-
&large);
48+
LAPACK_IMPL(slabad)(&smallv,
49+
&largev);
5050
}
5151

5252
template <typename XFLENS_VOID>
5353
void
54-
labad(double &small, double &large)
54+
labad(double &smallv, double &largev)
5555
{
5656
CXXLAPACK_DEBUG_OUT("dlabad");
5757

58-
LAPACK_IMPL(dlabad)(&small,
59-
&large);
58+
LAPACK_IMPL(dlabad)(&smallv,
59+
&largev);
6060
}
6161

6262

0 commit comments

Comments
 (0)