Skip to content

Commit 10b7f5a

Browse files
committed
Fix left-out ambiguities on sind, cosd, acosd.
Avoid confusion with functions from Intel C compiler. Add the missing using declaration.
1 parent f6dde54 commit 10b7f5a

2 files changed

Lines changed: 3 additions & 1 deletion

File tree

src/diffpy/srreal/Lattice.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ void Lattice::setLatPar(double a0, double b0, double c0,
5252
{
5353
using diffpy::mathutils::cosd;
5454
using diffpy::mathutils::sind;
55+
using diffpy::mathutils::acosd;
5556
ma = a0;
5657
mb = b0;
5758
mc = c0;

src/diffpy/srreal/PointsInSphere.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ LatticeParameters::LatticeParameters( double _a, double _b, double _c,
4343

4444
void LatticeParameters::update()
4545
{
46-
using namespace diffpy::mathutils;
46+
using diffpy::mathutils::cosd;
47+
using diffpy::mathutils::sind;
4748
ca = cosd(alpha); cb = cosd(beta); cg = cosd(gamma);
4849
sa = sind(alpha); sb = sind(beta); sg = sind(gamma);
4950
// Vunit is a volume of unit cell with a=b=c=1

0 commit comments

Comments
 (0)