From bd0f72c60edf13096a2a113f291f5798c47fda73 Mon Sep 17 00:00:00 2001 From: Dhanya Maliakal Date: Fri, 3 Mar 2017 09:12:19 +0100 Subject: [PATCH] removed std:: in front of round, else compile error --- slsDetectorSoftware/slsDetectorAnalysis/energyConversion.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slsDetectorSoftware/slsDetectorAnalysis/energyConversion.h b/slsDetectorSoftware/slsDetectorAnalysis/energyConversion.h index fa3410d73..54a104e03 100644 --- a/slsDetectorSoftware/slsDetectorAnalysis/energyConversion.h +++ b/slsDetectorSoftware/slsDetectorAnalysis/energyConversion.h @@ -75,7 +75,7 @@ class energyConversion V linearInterpolation(const E x, const E x1, const E x2, const V y1, const V y2){ double k = static_cast(y2-y1)/(x2-x1); double m = y1-k*x1; - int y = std::round( k*x+m ); + int y = round( k*x+m ); return static_cast(y); }