refs #5552 trying to fix Unix warning

mantidproject · Aug 4, 2012 · 7a50e2e · 7a50e2e
1 parent 32081fd
commit 7a50e2e
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDEventWSWrapper.h b/Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDEventWSWrapper.h
@@ -79,8 +79,8 @@ namespace Mantid
 
       /// the accessor verify if there are boxes in box-splitter cash which need splitting;
       bool ifNeedsSplitting()const{return m_needSplitting;}
-      /// method splits list of boxes
-      void splitList(Kernel::ThreadScheduler * ts){(this->*(mdBoxListSplitter[m_NDimensions]))();}
+      /// method splits list of boxes not yet uses thread sheduler but may be later
+      void splitList(Kernel::ThreadScheduler * ){(this->*(mdBoxListSplitter[m_NDimensions]))();}
     private:
       /// maximal nuber of dimensions, currently supported by the class;
       enum{ MAX_N_DIM=8};

diff --git a/Code/Mantid/Framework/MDEvents/test/MDBoxToChangeTest.h b/Code/Mantid/Framework/MDEvents/test/MDBoxToChangeTest.h
@@ -23,7 +23,7 @@ class MDBoxToChangeTest : public CxxTest::TestSuite
 void testConstructor()
 {
   rootBox = makeMDBox2();
-  MDBoxToChange<MDEvent<2>,2> * pBoxChanger;
+  MDBoxToChange<MDEvent<2>,2> * pBoxChanger(NULL);
   TS_ASSERT_THROWS_NOTHING((pBoxChanger = new MDBoxToChange<MDEvent<2> , 2>()));
   delete pBoxChanger;
   TS_ASSERT_THROWS_NOTHING((pBoxChanger = new MDBoxToChange<MDEvent<2> , 2>(dynamic_cast<MDBox<MDEvent<2>,2>*>(rootBox),0)));
@@ -46,14 +46,14 @@ void testSplitRootToGridbox()
 
 void testSplitAMemberToGridbox()
 {
-  MDBoxBase<MDEvent<2>,2>* aChildBox;
+  MDBoxBase<MDEvent<2>,2>* aChildBox(NULL);
   TS_ASSERT_THROWS_NOTHING(aChildBox = (dynamic_cast<MDGridBox<MDEvent<2>,2>*>(rootBox))->getChild(10));
 
   MDBoxToChange<MDEvent<2>,2>  BoxToSplit(dynamic_cast<MDBox<MDEvent<2>,2>*>(aChildBox),10);
 
   TSM_ASSERT("parent for the box to split should be rootbox: ",(BoxToSplit.getParent() == rootBox));
 
-  MDBoxBase<MDEvent<2>,2>* aGridBox;
+  MDBoxBase<MDEvent<2>,2>* aGridBox(NULL);
   TS_ASSERT_THROWS_NOTHING(aGridBox=BoxToSplit.splitToGridBox());
 
   TSM_ASSERT("This should be a grid box",(dynamic_cast<MDGridBox<MDEvent<2>,2>*>(aGridBox)));