From 5216d903d84fb905a655dc4c80b87f45b0fe11d7 Mon Sep 17 00:00:00 2001
From: Roman Tolchenov <roman.tolchenov@stfc.ac.uk>
Date: Fri, 19 Jun 2015 15:45:37 +0100
Subject: [PATCH] Re #11335. Fix compiler errors and warnings.
---
.../CustomInterfaces/src/MultiDatasetFit/MultiDatasetFit.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/MultiDatasetFit/MultiDatasetFit.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/MultiDatasetFit/MultiDatasetFit.cpp
index a478bc070e0..6dd5e11ed2a 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/MultiDatasetFit/MultiDatasetFit.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/MultiDatasetFit/MultiDatasetFit.cpp
@@ -178,7 +178,7 @@ void MultiDatasetFit::fitSequential()
m_fitOptionsBrowser->copyPropertiesToAlgorithm(*fit);
- m_outputWorkspaceName = m_fitOptionsBrowser->getProperty("OutputWorkspace") + "_Workspaces";
+ m_outputWorkspaceName = m_fitOptionsBrowser->getProperty("OutputWorkspace").toStdString() + "_Workspaces";
m_fitRunner.reset( new API::AlgorithmRunner() );
connect( m_fitRunner.get(),SIGNAL(algorithmComplete(bool)), this, SLOT(finishFit(bool)), Qt::QueuedConnection );
@@ -343,7 +343,7 @@ void MultiDatasetFit::finishFit(bool error)
{
auto paramsWSName = m_fitOptionsBrowser->getProperty("OutputWorkspace").toStdString();
if (!Mantid::API::AnalysisDataService::Instance().doesExist(paramsWSName)) return;
- auto nSpectra = getNumberOfSpectra();
+ size_t nSpectra = getNumberOfSpectra();
if (nSpectra == 0) return;
fun = m_functionBrowser->getGlobalFunction();
auto nParams = fun->nParams() / nSpectra;
--
GitLab