From 6fc02378cfe08bedbf778cd8b0323b355a3f2c6a Mon Sep 17 00:00:00 2001
From: Owen Arnold <owen.arnold@stfc.ac.uk>
Date: Thu, 21 Jun 2012 08:44:57 +0100
Subject: [PATCH] refs #5489. Fix warnings and newly introduced error.
---
.../Framework/MDEvents/src/ImportMDHistoWorkspace.cpp | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/Code/Mantid/Framework/MDEvents/src/ImportMDHistoWorkspace.cpp b/Code/Mantid/Framework/MDEvents/src/ImportMDHistoWorkspace.cpp
index 9a90741ec0b..8fb943575cb 100644
--- a/Code/Mantid/Framework/MDEvents/src/ImportMDHistoWorkspace.cpp
+++ b/Code/Mantid/Framework/MDEvents/src/ImportMDHistoWorkspace.cpp
@@ -127,7 +127,11 @@ namespace MDEvents
void ImportMDHistoWorkspace::exec()
{
// Fetch input properties
- size_t ndims = getProperty("Dimensionality");
+ size_t ndims;
+ {
+ int ndims_int = getProperty("Dimensionality");
+ ndims = ndims_int;
+ }
std::vector<double> extents = getProperty("Extents");
std::vector<int> nbins = getProperty("NumberOfBins");
std::vector<std::string> names = getProperty("Names");
@@ -146,7 +150,7 @@ namespace MDEvents
// Fabricate new dimensions from inputs
std::vector<MDHistoDimension_sptr> dimensions;
- for(int k = 0; k < ndims; ++k)
+ for(size_t k = 0; k < ndims; ++k)
{
dimensions.push_back(MDHistoDimension_sptr(new MDHistoDimension(names[k], names[k], units[k], static_cast<coord_t>(extents[k*2]), static_cast<coord_t>(extents[(k*2) + 1]), nbins[k])));
}
--
GitLab