Skip to content

Commit f6dde54

Browse files
committed
Avoid name ambiguity for sind, cosd, acosd.
These are also declared in mathimf.h from Intel C compiler.
1 parent 327f17b commit f6dde54

1 file changed

Lines changed: 3 additions & 2 deletions

File tree

src/diffpy/srreal/Lattice.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ Lattice::Lattice(double a0, double b0, double c0,
5050
void Lattice::setLatPar(double a0, double b0, double c0,
5151
double alpha0, double beta0, double gamma0)
5252
{
53-
using namespace diffpy::mathutils;
53+
using diffpy::mathutils::cosd;
54+
using diffpy::mathutils::sind;
5455
ma = a0;
5556
mb = b0;
5657
mc = c0;
@@ -103,7 +104,7 @@ void Lattice::setLatBase(const R3::Vector& va0,
103104
const R3::Vector& vb0,
104105
const R3::Vector& vc0)
105106
{
106-
using namespace diffpy::mathutils;
107+
using diffpy::mathutils::acosd;
107108
R3::row(mbase, 0) = va0;
108109
R3::row(mbase, 1) = vb0;
109110
R3::row(mbase, 2) = vc0;

0 commit comments

Comments
 (0)