diff --git a/arbor/include/arbor/math.hpp b/arbor/include/arbor/math.hpp index cd228184f392b1e510e5ac075719c098c7f028c3..17e12b3c2c2242e91a195f1cc8585815507ed1ff 100644 --- a/arbor/include/arbor/math.hpp +++ b/arbor/include/arbor/math.hpp @@ -36,7 +36,7 @@ T constexpr area_circle(T r) { // with length L, end radii r1, r2. template <typename T> T constexpr area_frustrum(T L, T r1, T r2) { - return pi<T> * (r1+r2) * sqrt(square(L) + square(r1-r2)); + return pi<T> * (r1+r2) * std::sqrt(square(L) + square(r1-r2)); } // Volume of conic frustrum of length L, end radii r1, r2. diff --git a/modcc/symdiff.cpp b/modcc/symdiff.cpp index 1b4028eba54bd5254cec2da49fe217fbeaa7458f..783a3ad0bb17a873203fcf9764b7a07abf681b9e 100644 --- a/modcc/symdiff.cpp +++ b/modcc/symdiff.cpp @@ -175,7 +175,7 @@ public: expression_ptr dlhs = std::move(result_); e->rhs()->accept(this); - result_ = make_expression<SubBinaryExpression>(loc, move(dlhs), result()); + result_ = make_expression<SubBinaryExpression>(loc, std::move(dlhs), result()); } void visit(MulBinaryExpression* e) override {