From a012daa3c2419964d29d87b11c6d3807ebf90d4f Mon Sep 17 00:00:00 2001
From: Pete Peterson <petersonpf@ornl.gov>
Date: Wed, 17 Aug 2016 11:14:34 -0400
Subject: [PATCH] Move to c++11 functions
---
Framework/DataHandling/src/LoadGSS.cpp | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/Framework/DataHandling/src/LoadGSS.cpp b/Framework/DataHandling/src/LoadGSS.cpp
index ff7342be05d..9f26e29dfc9 100644
--- a/Framework/DataHandling/src/LoadGSS.cpp
+++ b/Framework/DataHandling/src/LoadGSS.cpp
@@ -15,10 +15,10 @@
#include "MantidKernel/UnitFactory.h"
#include <boost/regex.hpp>
-#include <Poco/File.h>
-
#include <fstream>
+#include <Poco/File.h>
#include <sstream>
+#include <string>
using namespace Mantid::DataHandling;
using namespace Mantid::API;
@@ -197,7 +197,7 @@ API::MatrixWorkspace_sptr LoadGSS::loadGSASFile(const std::string &filename,
boost::smatch result;
if (boost::regex_search(inputLine.str(), result, L1_REG_EXP) &&
result.size() == 2) {
- primaryflightpath = atof(std::string(result[1]).c_str());
+ primaryflightpath = std::stod(std::string(result[1]));
} else {
std::stringstream msg;
@@ -220,9 +220,9 @@ API::MatrixWorkspace_sptr LoadGSS::loadGSASFile(const std::string &filename,
boost::smatch result;
if (boost::regex_search(inputLine.str(), result, DET_POS_REG_EXP) &&
result.size() == 4) {
- totalpath = atof(std::string(result[1]).c_str());
- tth = atof(std::string(result[2]).c_str());
- difc = atof(std::string(result[3]).c_str());
+ totalpath = std::stod(std::string(result[1]));
+ tth = std::stod(std::string(result[2]));
+ difc = std::stod(std::string(result[3]));
} else {
std::stringstream msg;
msg << "Failed to parse position from line \"" << inputLine.str()
@@ -468,7 +468,7 @@ double LoadGSS::convertToDouble(std::string inputstring) {
}
}
- double rd = atof(temps.c_str());
+ double rd = std::stod(temps);
return rd;
}
--
GitLab