refs #10384 gcc warnings and small modifications to interface

mantidproject · Oct 28, 2014 · 43cf19d · 43cf19d
1 parent db08fcb
commit 43cf19d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/Code/Mantid/Framework/Algorithms/src/Rebin.cpp b/Code/Mantid/Framework/Algorithms/src/Rebin.cpp
@@ -117,7 +117,9 @@ namespace Mantid
       setPropertySettings("EMode",
         new Kernel::VisibleWhenProperty("FlatBkgWorkspace", IS_NOT_EQUAL_TO, ""));
 
-
+      std::string bgRemovalGrp("Remove Background during rebinning settings:");
+      setPropertyGroup("FlatBkgWorkspace", bgRemovalGrp);
+      setPropertyGroup("EMode", bgRemovalGrp);
     }
 
 
@@ -351,7 +353,7 @@ namespace Mantid
             if(!failedBkgRemoalList.empty())
             {
               size_t nFailed = failedBkgRemoalList.size();
-              if(nFailed == histnumber)
+              if(nFailed == static_cast<size_t>(histnumber))
               {
                 g_log.warning()<<" has not been able to remove any background while rebinning workspace "<<inputWS->getName()<<
                   "\n possible reasons: wrong instrument or units conversion mode\n";

diff --git a/Code/Mantid/Framework/Algorithms/test/BackgroundHelperTest.h b/Code/Mantid/Framework/Algorithms/test/BackgroundHelperTest.h
@@ -119,7 +119,7 @@ class BackgroundHelperTest : public CxxTest::TestSuite
 
     const MantidVec & sampleX = SampleWS->readX(0);
     const MantidVec & sampleY = SampleWS->readY(0);
-    const MantidVec & sampleE = SampleWS->readE(0);
+    //const MantidVec & sampleE = SampleWS->readE(0);
     for(size_t i=0;i<sampleY.size();i++)
     {
       TS_ASSERT_DELTA(dataX[i],sampleX[i],1.e-7);