Start fixing build issues.

Framework/DataObjects/test/PeakTest.h

@@ -19,6 +19,17 @@ using namespace Mantid::DataObjects;
 using namespace Mantid::Geometry;
 using namespace Mantid::Kernel;
 
+namespace boost {
+template <class CharType, class CharTrait>
+std::basic_ostream<CharType, CharTrait> &
+operator<<(std::basic_ostream<CharType, CharTrait> &out,
+           optional<double> const &maybe) {
+  if (maybe)
+    out << maybe;
+  return out;
+}
+}
+
 class PeakTest : public CxxTest::TestSuite {
 private:
   /// Common instrument

Vates/VatesAPI/src/vtkDataSetToPeaksFilteredDataSet.cpp

@@ -181,7 +181,6 @@ GCC_DIAG_OFF(strict-aliasing)
   /**
    * Add information for a single peak to the peakInfo vector.
    * @param peak The peak from which the information will be extracted.
-   * @param coordinateSystem The coordinate system in which the peaks position should be retrieved.
    * @param peaksInfo A reference to the vector containing peak information.
    */
 void vtkDataSetToPeaksFilteredDataSet::addSinglePeak(