refs #6449 Some warnings

mantidproject · Apr 6, 2013 · 2bb7b4f · 2bb7b4f
1 parent 6c151c3
commit 2bb7b4f
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/MergeMDFiles.cpp b/Code/Mantid/Framework/MDAlgorithms/src/MergeMDFiles.cpp
@@ -260,7 +260,7 @@ namespace MDAlgorithms
 
     this->totalLoaded = 0;
     std::vector<API::IMDNode *> &boxes = m_BoxStruct.getBoxes();
-    std::vector<uint64_t>      &targetEventIndexes= m_BoxStruct.getEventIndex();    
+    //std::vector<uint64_t>      &targetEventIndexes= m_BoxStruct.getEventIndex();    
 
     for(size_t ib=0;ib<numBoxes;ib++)
     {

diff --git a/Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDBoxToChange.h b/Code/Mantid/Framework/MDEvents/inc/MantidMDEvents/MDBoxToChange.h
@@ -58,7 +58,7 @@ namespace Mantid
       /**function checks if the containing box has enough data 
        * the definition "enough" is also specified within this function
       */
-      bool isFull(size_t maxSize=1000)
+      bool isFull(size_t /*maxSize=1000*/)
       {
         /**stub */
         return true;

diff --git a/Code/Mantid/Framework/MDEvents/src/MDBox.cpp b/Code/Mantid/Framework/MDEvents/src/MDBox.cpp
@@ -759,7 +759,7 @@ namespace MDEvents
    * @param index :: current index for box
    */
   TMDE(
-  void MDBox)::addAndTraceEvent( const MDE & point, size_t index)
+  void MDBox)::addAndTraceEvent( const MDE & point, size_t /*index*/)
   {
     this->m_dataMutex.lock();
     this->data.push_back(point);

diff --git a/Code/Mantid/Framework/MDEvents/src/MDBoxFlatTree.cpp b/Code/Mantid/Framework/MDEvents/src/MDBoxFlatTree.cpp
@@ -104,9 +104,9 @@ namespace Mantid
       m_BoxSignalErrorsquared[id*2] = double(Box->getSignal());
       m_BoxSignalErrorsquared[id*2+1] = double(Box->getErrorSquared());
       m_InverseVolume[id] = Box->getInverseVolume();
-      for (size_t d=0; d<m_nDim; d++)
+      for (int d=0; d<m_nDim; d++)
       {
-        size_t newIndex = id*(m_nDim*2) + d*2;
+        size_t newIndex = id*size_t(m_nDim*2) + d*2;
         m_Extents[newIndex]   = Box->getExtents(d).getMin();
         m_Extents[newIndex+1] = Box->getExtents(d).getMax();
 

diff --git a/Code/Mantid/Framework/MDEvents/test/BoxControllerNxSIOTest.h b/Code/Mantid/Framework/MDEvents/test/BoxControllerNxSIOTest.h
@@ -110,7 +110,7 @@ void setUp()
 
  void testWriteReadReadFloat()
  {
-     MDEvents::BoxControllerNxSIO *pSaver;
+     MDEvents::BoxControllerNxSIO *pSaver(NULL);
      TS_ASSERT_THROWS_NOTHING(pSaver=new MDEvents::BoxControllerNxSIO(sc.get()));
       std::string FullPathFile;