refs #7664. Fix warnings

mantidproject · Aug 27, 2013 · b2933e6 · b2933e6
1 parent 898d174
commit b2933e6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Code/Mantid/Framework/Crystal/test/ClearUBTest.h b/Code/Mantid/Framework/Crystal/test/ClearUBTest.h
@@ -49,13 +49,13 @@ class ClearUBTest : public CxxTest::TestSuite
   }
 
   // Helper method to create a MDHW
-  std::string createMDHistoWorkspace(const int nExperimentInfosToAdd = 2)
+  std::string createMDHistoWorkspace(const uint16_t nExperimentInfosToAdd = 2)
   {
     const std::string wsName = "TestWorkspace";
     auto ws = MDEventsTestHelper::makeFakeMDHistoWorkspace(1, 1, 10, 10, 1, wsName);
     ws->getExperimentInfo(0)->mutableSample().setOrientedLattice(new OrientedLattice(1.0,2.0,3.0, 90, 90,90));
 
-    for(int i = 1; i < nExperimentInfosToAdd; ++i)
+    for(uint16_t i = 1; i < nExperimentInfosToAdd; ++i)
     {
       ExperimentInfo_sptr experimentInfo = boost::make_shared<ExperimentInfo>();
       ws->addExperimentInfo(experimentInfo);

diff --git a/Code/Mantid/Framework/Crystal/test/HasUBTest.h b/Code/Mantid/Framework/Crystal/test/HasUBTest.h
@@ -36,14 +36,14 @@ class HasUBTest: public CxxTest::TestSuite
   }
 
   // Helper method to create a MDHW
-  std::string createMDHistoWorkspace(const int nExperimentInfosToAdd = 2)
+  std::string createMDHistoWorkspace(const uint16_t nExperimentInfosToAdd = 2)
   {
     const std::string wsName = "TestWorkspace";
     auto ws = MDEventsTestHelper::makeFakeMDHistoWorkspace(1, 1, 10, 10, 1, wsName);
     ws->getExperimentInfo(0)->mutableSample().setOrientedLattice(
         new OrientedLattice(1.0, 2.0, 3.0, 90, 90, 90));
 
-    for (int i = 1; i < nExperimentInfosToAdd; ++i)
+    for (uint16_t i = 1; i < nExperimentInfosToAdd; ++i)
     {
       ExperimentInfo_sptr experimentInfo = boost::make_shared<ExperimentInfo>();
       ws->addExperimentInfo(experimentInfo);
@@ -112,7 +112,7 @@ class HasUBTest: public CxxTest::TestSuite
     auto ws = AnalysisDataService::Instance().retrieveWS<MatrixWorkspace>(wsName);
     TSM_ASSERT("No oriented lattice to begin with", !ws->sample().hasOrientedLattice());
 
-    bool hasUB;
+    bool hasUB = true;
     TSM_ASSERT_THROWS_NOTHING("Should safely handle this.", hasUB = doExecute(wsName));
     TS_ASSERT(!hasUB);
 
@@ -127,7 +127,7 @@ class HasUBTest: public CxxTest::TestSuite
     const std::string wsName = "tablews";
     AnalysisDataService::Instance().addOrReplace(wsName, inws);
 
-    bool hasUB;
+    bool hasUB = true;
     TSM_ASSERT_THROWS_NOTHING("Should safely handle this.", hasUB = doExecute(wsName));
     TS_ASSERT(!hasUB);