refs #6271. Fix GCC warnings.

mantidproject · Jan 11, 2013 · b5d8dcf · b5d8dcf
1 parent 6b18eca
commit b5d8dcf
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Code/Mantid/MantidQt/SliceViewer/inc/MantidQtSliceViewer/CompositePeaksPresenter.h b/Code/Mantid/MantidQt/SliceViewer/inc/MantidQtSliceViewer/CompositePeaksPresenter.h
@@ -69,8 +69,6 @@ namespace MantidQt
     private:
       /// Alias for container of subjects type.
       typedef std::vector<PeaksPresenter_sptr> SubjectContainer;
-      /// Default behaviour 
-      PeaksPresenter_sptr m_default;
       /// Subject presenters.
       SubjectContainer m_subjects;
       /// Use default
@@ -83,6 +81,8 @@ namespace MantidQt
       PeakPalette m_palette;
       /// Zoomable peaks view.
       ZoomablePeaksView* const m_zoomablePlottingWidget;
+      /// Default behaviour 
+      PeaksPresenter_sptr m_default;
     };
   }
 }

diff --git a/Code/Mantid/MantidQt/SliceViewer/src/CompositePeaksPresenter.cpp b/Code/Mantid/MantidQt/SliceViewer/src/CompositePeaksPresenter.cpp
@@ -192,7 +192,7 @@ namespace MantidQt
       SubjectContainer::iterator iterator = getPresenterIteratorFromWorkspace(ws);
 
       // Update the palette the foreground colour
-      const int pos = std::distance(m_subjects.begin(), iterator);
+      const int pos = static_cast<int>(std::distance(m_subjects.begin(), iterator));
       m_palette.setForegroundColour(pos, colour);
 
       // Apply the foreground colour
@@ -209,7 +209,7 @@ namespace MantidQt
       SubjectContainer::iterator iterator = getPresenterIteratorFromWorkspace(ws);
 
       // Update the palette background colour.
-      const int pos = std::distance(m_subjects.begin(), iterator);
+      const int pos = static_cast<int>(std::distance(m_subjects.begin(), iterator));
       m_palette.setBackgroundColour(pos, colour);
 
       // Apply the background colour
@@ -248,7 +248,7 @@ namespace MantidQt
         throw std::runtime_error("Foreground colours from palette cannot be fetched until nested presenters are added.");
       }
       SubjectContainer::const_iterator iterator = getPresenterIteratorFromWorkspace(ws);
-      const int pos = std::distance(m_subjects.begin(), iterator);
+      const int pos = static_cast<int>(std::distance(m_subjects.begin(), iterator));
       return m_palette.foregroundIndexToColour(pos);
     }
 
@@ -263,7 +263,7 @@ namespace MantidQt
         throw std::runtime_error("Background colours from palette cannot be fetched until nested presenters are added.");
       }
       SubjectContainer::const_iterator iterator = getPresenterIteratorFromWorkspace(ws);
-      const int pos = std::distance(m_subjects.begin(), iterator);
+      const int pos = static_cast<int>(std::distance(m_subjects.begin(), iterator));
       return m_palette.backgroundIndexToColour(pos);
     }