From 4ea429dcd05dbbe3875713cbe2e88dd0e3ea64b7 Mon Sep 17 00:00:00 2001
From: boeschf <48126478+boeschf@users.noreply.github.com>
Date: Tue, 4 Oct 2022 11:59:19 +0200
Subject: [PATCH] added missing std namespace (#1994)
use std variants of sqrt and move (removes warnings, and is safer)
---
arbor/include/arbor/math.hpp | 2 +-
modcc/symdiff.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arbor/include/arbor/math.hpp b/arbor/include/arbor/math.hpp
index cd228184..17e12b3c 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 1b4028eb..783a3ad0 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 {
--
GitLab