From 2cd314f421beea714835ca91ce615e597980ed4d Mon Sep 17 00:00:00 2001 From: Miren Radia <32646026+mirenradia@users.noreply.github.com> Date: Thu, 6 Jul 2023 17:16:40 +0100 Subject: [PATCH] DataServices: Qualify math functions with `std::` namespace specifier (#3406) ## Summary As in the title. This fixes #3405. ## Additional background I did briefly look at using `powi`, but I don't think the exponents are known at compile time. I also added some auto-generated source files to .gitignore. --- .gitignore | 8 +++++++- Src/Extern/amrdata/AMReX_DataServices.cpp | 4 ++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 21d2613d57e..bb9a7bfb661 100644 --- a/.gitignore +++ b/.gitignore @@ -61,4 +61,10 @@ Tutorials/EB/Donut/Exec/ls_plt* # local config Tools/GNUMake/Make.local -Tools/GNUMake/Make.local-pre \ No newline at end of file +Tools/GNUMake/Make.local-pre + +# profparser +BLProfParser.lex.yy.cpp +BLProfParser.tab.H +BLProfParser.tab.cpp +BLProfParserNC.y diff --git a/Src/Extern/amrdata/AMReX_DataServices.cpp b/Src/Extern/amrdata/AMReX_DataServices.cpp index ac485e03d06..2f82e1cb685 100644 --- a/Src/Extern/amrdata/AMReX_DataServices.cpp +++ b/Src/Extern/amrdata/AMReX_DataServices.cpp @@ -2488,7 +2488,7 @@ void DataServices::RunTimelinePF(std::map &mpiFuncNames, int ntnSize(nameTagNames.size()); ntnNumbers.resize(ntnSize, 0.0); if(ntnSize > 0) { - ntnMultiplier = pow(10, static_cast( 1 + log10(ntnSize))); + ntnMultiplier = std::pow(10, static_cast( 1 + std::log10(ntnSize))); } for(int i(0); i < ntnSize; ++i) { if(ntnMultiplier > 0.0) { @@ -2501,7 +2501,7 @@ void DataServices::RunTimelinePF(std::map &mpiFuncNames, int bnSize(barrierNames.size()); bnNumbers.resize(bnSize, 0.0); if(bnSize > 0) { - bnMultiplier = pow(10, static_cast( 1 + log10(bnSize))); + bnMultiplier = std::pow(10, static_cast( 1 + std::log10(bnSize))); } for(int i(0); i < bnSize; ++i) { if(bnMultiplier > 0.0) {