From c3990ebbe906da61309cbb270cac46fd09d8cca4 Mon Sep 17 00:00:00 2001
From: Elliot Oram <Elliot.Oram@stfc.ac.uk>
Date: Thu, 27 Aug 2015 13:15:12 +0100
Subject: [PATCH] Minor updates to syntax to ensure correct functionality
Refs #12419
---
.../WorkflowAlgorithms/src/ConvolutionFitSequential.cpp | 2 +-
Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ConvFit.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Code/Mantid/Framework/WorkflowAlgorithms/src/ConvolutionFitSequential.cpp b/Code/Mantid/Framework/WorkflowAlgorithms/src/ConvolutionFitSequential.cpp
index 054979fa2c9..1ef71a5d256 100644
--- a/Code/Mantid/Framework/WorkflowAlgorithms/src/ConvolutionFitSequential.cpp
+++ b/Code/Mantid/Framework/WorkflowAlgorithms/src/ConvolutionFitSequential.cpp
@@ -207,7 +207,7 @@ void ConvolutionFitSequential::exec() {
std::string plotPeakInput = "";
for (int i = 0; i < specMax + 1; i++) {
std::string nextWs = tempFitWsName + ",i";
- nextWs += std::to_string(i);
+ nextWs += boost::lexical_cast<std::string>(i);
plotPeakInput += nextWs + ";";
}
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ConvFit.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ConvFit.cpp
index a6f6415c8eb..850bfe47c14 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ConvFit.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ConvFit.cpp
@@ -277,7 +277,7 @@ void ConvFit::run() {
addSaveWorkspaceToQueue(QresultWsName, fullPath);
}
- if (!plot.compare("None") == 0) {
+ if (!(plot.compare("None") == 0)) {
if (plot.compare("All") == 0) {
int specEnd = (int)resultWs->getNumberHistograms();
for (int i = 0; i < specEnd; i++) {
--
GitLab