diff --git a/Code/Mantid/Framework/MDAlgorithms/src/Integrate3DEvents.cpp b/Code/Mantid/Framework/MDAlgorithms/src/Integrate3DEvents.cpp index 57c34fdac6b80868699f25be27df507b07169b18..9b316b490e337cd364c951ffd09c16601f4b3342 100644 --- a/Code/Mantid/Framework/MDAlgorithms/src/Integrate3DEvents.cpp +++ b/Code/Mantid/Framework/MDAlgorithms/src/Integrate3DEvents.cpp @@ -418,7 +418,8 @@ void Integrate3DEvents::addEvent(std::pair<double, V3D> event_Q, bool hkl_integ) * */ PeakShapeEllipsoid_const_sptr Integrate3DEvents::ellipseIntegrateEvents( - std::vector<std::pair<double, V3D> > const &ev_list, std::vector<V3D> const &directions, + std::vector<std::pair<double, Mantid::Kernel::V3D> > const &ev_list, + std::vector<Mantid::Kernel::V3D> const &directions, std::vector<double> const &sigmas, bool specify_size, double peak_radius, double back_inner_radius, double back_outer_radius, std::vector<double> &axes_radii, double &inti, double &sigi) { diff --git a/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/inc/MantidVatesSimpleGuiViewWidgets/BackgroundRgbProvider.h b/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/inc/MantidVatesSimpleGuiViewWidgets/BackgroundRgbProvider.h index 57a4bc2791fffdf560eb7c92f71e7f7a75a2f469..228e3283a23f1ef443a8c24f9e1dbe17519cd890 100644 --- a/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/inc/MantidVatesSimpleGuiViewWidgets/BackgroundRgbProvider.h +++ b/Code/Mantid/Vates/VatesSimpleGui/ViewWidgets/inc/MantidVatesSimpleGuiViewWidgets/BackgroundRgbProvider.h @@ -94,9 +94,14 @@ namespace Mantid /** * Callback function for background color changing events - *@param caller Calling object. + * @param caller Calling object. + * + * @param eventID vtkCommand event ID for callbacks, not used here + * @param clientData vtk client data, not used here + * @param callData vtk call data, not used here */ - static void backgroundColorChangeCallbackFunction(vtkObject* caller, long unsigned int, void*, void*); + static void backgroundColorChangeCallbackFunction(vtkObject* caller, long unsigned int eventID, + void *clientData, void *callData); static QColor currentBackgroundColor;