refs #9194. Fix gcc warnings.

mantidproject · Apr 2, 2014 · 070489f · 070489f
1 parent 9a266c5
commit 070489f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/Code/Mantid/Framework/Crystal/src/ConnectedComponentLabeling.cpp b/Code/Mantid/Framework/Crystal/src/ConnectedComponentLabeling.cpp
@@ -151,7 +151,6 @@ namespace Mantid
       allNonBackgroundIndexes.reserve(ws->getNPoints());
 
       progress.doReport("Pre-processing to filter background out");
-      const size_t nPoints = ws->getNPoints();
       progress.resetNumSteps(100000, 0.0, 0.25);
       if(m_runMultiThreaded)
       {
@@ -176,7 +175,7 @@ namespace Mantid
             while(iterator->next());
           }
           // Consolidate work from individual threads.
-          for(size_t i = 0; i < nthreads; ++i)
+          for(int i = 0; i < nthreads; ++i)
           {
             VecIndexes& source = manyNonBackgroundIndexes[i];
             allNonBackgroundIndexes.insert(allNonBackgroundIndexes.end(), source.begin(), source.end());

diff --git a/Code/Mantid/Framework/Crystal/src/IntegratePeaksUsingClusters.cpp b/Code/Mantid/Framework/Crystal/src/IntegratePeaksUsingClusters.cpp
@@ -161,7 +161,7 @@ namespace Mantid
       IMDHistoWorkspace_sptr clusters = analysis.executeAndIntegrate(mdWS, &backgroundStrategy, labelMap, positionMap, progress);
 
       // Link integrated values up with peaks.
-      const size_t nPeaks = peakWS->getNumberPeaks();
+      const int nPeaks = peakWS->getNumberPeaks();
       progress.resetNumSteps(nPeaks, 0, 1);
       progress.doReport("Writing out PeaksWorkspace");
       PARALLEL_FOR1(peakWS)
@@ -205,4 +205,4 @@ namespace Mantid
 
 
   } // namespace Crystal
-} // namespace Mantid
+} // namespace Mantid