Refs #11400. Fix all warning on OSX 10.9

Code/Mantid/Framework/API/inc/MantidAPI/DomainCreatorFactory.h

@@ -59,7 +59,7 @@ class MANTID_API_DLL DomainCreatorFactoryImpl
   /// Private Constructor for singleton class
   DomainCreatorFactoryImpl();
   /// No copying
-  DISABLE_COPY_AND_ASSIGN(DomainCreatorFactoryImpl);
+  DISABLE_COPY_AND_ASSIGN(DomainCreatorFactoryImpl)
   /// Private Destructor for singleton
   virtual ~DomainCreatorFactoryImpl();
 

Code/Mantid/Framework/API/inc/MantidAPI/ScopedWorkspace.h

@@ -74,7 +74,7 @@ class DLLExport ScopedWorkspace {
   void set(Workspace_sptr newWS);
 
 private:
-  DISABLE_COPY_AND_ASSIGN(ScopedWorkspace);
+  DISABLE_COPY_AND_ASSIGN(ScopedWorkspace)
 
   /// ADS name of the workspace
   const std::string m_name;

Code/Mantid/Framework/CurveFitting/inc/MantidCurveFitting/AugmentedLagrangianOptimizer.h

@@ -154,8 +154,8 @@ class MANTID_CURVEFITTING_DLL AugmentedLagrangianOptimizer {
   void minimize(std::vector<double> &xv) const;
 
 private:
-  DISABLE_DEFAULT_CONSTRUCT(AugmentedLagrangianOptimizer);
-  DISABLE_COPY_AND_ASSIGN(AugmentedLagrangianOptimizer);
+  DISABLE_DEFAULT_CONSTRUCT(AugmentedLagrangianOptimizer)
+  DISABLE_COPY_AND_ASSIGN(AugmentedLagrangianOptimizer)
 
   friend class UnconstrainedCostFunction;
   /// Using gradient optimizer to perform limited optimization of current set

Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/ISISRunLogs.h

@@ -54,7 +54,7 @@ class DLLExport ISISRunLogs {
   void addPeriodLogs(const int period, API::Run &exptRun);
 
 private:
-  DISABLE_DEFAULT_CONSTRUCT(ISISRunLogs);
+  DISABLE_DEFAULT_CONSTRUCT(ISISRunLogs)
 
   /// A LogParser object
   boost::scoped_ptr<Kernel::LogParser> m_logParser;

Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadSINQFocus.h

@@ -77,7 +77,6 @@ class DLLExport LoadSINQFocus
   std::vector<std::string> m_supportedInstruments;
   std::string m_instrumentName;
   std::string m_instrumentPath;
-  ;
   API::MatrixWorkspace_sptr m_localWorkspace;
   size_t m_numberOfTubes;         // number of tubes - X
   size_t m_numberOfPixelsPerTube; // number of pixels per tube - Y

Code/Mantid/Framework/DataHandling/src/SaveSPE.cpp

@@ -25,11 +25,21 @@ DECLARE_ALGORITHM(SaveSPE)
 *  @throws std::runtime_error :: throws when there is a problem writing to disk,
 * usually disk space or permissions based
 */
+
+#if __clang__
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"
+#endif
+
 #define FPRINTF_WITH_EXCEPTION(stream, format, ...)                            \
   if (fprintf(stream, format, ##__VA_ARGS__) <= 0) {                           \
     throw std::runtime_error(                                                  \
         "Error writing to file. Check folder permissions and disk space.");    \
   }
+
+#if __clang__
+#pragma clang diagnostic pop
+#endif
 
 using namespace Kernel;
 using namespace API;

Code/Mantid/Framework/Kernel/inc/MantidKernel/FileDescriptor.h

@@ -78,8 +78,8 @@ class MANTID_KERNEL_DLL FileDescriptor {
   void resetStreamToStart();
 
 private:
-  DISABLE_DEFAULT_CONSTRUCT(FileDescriptor);
-  DISABLE_COPY_AND_ASSIGN(FileDescriptor);
+  DISABLE_DEFAULT_CONSTRUCT(FileDescriptor)
+  DISABLE_COPY_AND_ASSIGN(FileDescriptor)
 
   /// Open the file and cache description elements
   void initialize(const std::string &filename);

Code/Mantid/Framework/Kernel/inc/MantidKernel/FilteredTimeSeriesProperty.h

@@ -49,7 +49,7 @@ class DLLExport FilteredTimeSeriesProperty
   const TimeSeriesProperty<HeldType> *unfiltered() const;
 
 private:
-  DISABLE_DEFAULT_CONSTRUCT(FilteredTimeSeriesProperty);
+  DISABLE_DEFAULT_CONSTRUCT(FilteredTimeSeriesProperty)
 
   /// The original unfiltered property as an owned pointer
   const TimeSeriesProperty<HeldType> *m_unfiltered;

Code/Mantid/Framework/Kernel/inc/MantidKernel/LogFilter.h

@@ -68,8 +68,8 @@ class MANTID_KERNEL_DLL LogFilter {
   void clear();
 
 private:
-  DISABLE_DEFAULT_CONSTRUCT(LogFilter);
-  DISABLE_COPY_AND_ASSIGN(LogFilter);
+  DISABLE_DEFAULT_CONSTRUCT(LogFilter)
+  DISABLE_COPY_AND_ASSIGN(LogFilter)
 
   /// Converts the given property to a TimeSeriesProperty<double>, throws if
   /// invalid.

Code/Mantid/Framework/Kernel/inc/MantidKernel/MagneticFormFactorTable.h

@@ -45,8 +45,8 @@ class MANTID_KERNEL_DLL MagneticFormFactorTable {
   double value(const double qsqr) const;
 
 private:
-  DISABLE_DEFAULT_CONSTRUCT(MagneticFormFactorTable);
-  DISABLE_COPY_AND_ASSIGN(MagneticFormFactorTable);
+  DISABLE_DEFAULT_CONSTRUCT(MagneticFormFactorTable)
+  DISABLE_COPY_AND_ASSIGN(MagneticFormFactorTable)
 
   /// Setup the table with the values
   void setup(const MagneticIon &ion, const uint16_t j, const uint16_t l);

Code/Mantid/Framework/Kernel/inc/MantidKernel/Math/Optimization/SLSQPMinimizer.h

@@ -106,8 +106,8 @@ class DLLExport SLSQPMinimizer {
   std::vector<double> minimize(const std::vector<double> &x0) const;
 
 private:
-  DISABLE_DEFAULT_CONSTRUCT(SLSQPMinimizer);
-  DISABLE_COPY_AND_ASSIGN(SLSQPMinimizer);
+  DISABLE_DEFAULT_CONSTRUCT(SLSQPMinimizer)
+  DISABLE_COPY_AND_ASSIGN(SLSQPMinimizer)
 
   /**
    * Compute the value of the objective function

Code/Mantid/Framework/Kernel/inc/MantidKernel/MersenneTwister.h

@@ -80,8 +80,8 @@ class MANTID_KERNEL_DLL MersenneTwister : public PseudoRandomNumberGenerator {
   virtual void restore();
 
 private:
-  DISABLE_DEFAULT_CONSTRUCT(MersenneTwister);
-  DISABLE_COPY_AND_ASSIGN(MersenneTwister);
+  DISABLE_DEFAULT_CONSTRUCT(MersenneTwister)
+  DISABLE_COPY_AND_ASSIGN(MersenneTwister)
 
   /// The boost Mersenne Twister generator
   boost::mt19937 m_generator;

Code/Mantid/Framework/Kernel/inc/MantidKernel/NDPseudoRandomNumberGenerator.h

@@ -65,8 +65,8 @@ class DLLExport NDPseudoRandomNumberGenerator : public NDRandomNumberGenerator {
   void restore();
 
 private:
-  DISABLE_DEFAULT_CONSTRUCT(NDPseudoRandomNumberGenerator);
-  DISABLE_COPY_AND_ASSIGN(NDPseudoRandomNumberGenerator);
+  DISABLE_DEFAULT_CONSTRUCT(NDPseudoRandomNumberGenerator)
+  DISABLE_COPY_AND_ASSIGN(NDPseudoRandomNumberGenerator)
 
   /// The single value generator
   SingleValueGenerator m_singleValueGen;

Code/Mantid/Framework/Kernel/inc/MantidKernel/NDRandomNumberGenerator.h

@@ -72,8 +72,8 @@ class MANTID_KERNEL_DLL NDRandomNumberGenerator {
   inline std::vector<double> &getNextPointCache() { return m_nextPoint; }
 
 private:
-  DISABLE_DEFAULT_CONSTRUCT(NDRandomNumberGenerator);
-  DISABLE_COPY_AND_ASSIGN(NDRandomNumberGenerator);
+  DISABLE_DEFAULT_CONSTRUCT(NDRandomNumberGenerator)
+  DISABLE_COPY_AND_ASSIGN(NDRandomNumberGenerator)
 
   /// The number of dimensions
   const unsigned int m_ndims;

Code/Mantid/Framework/Kernel/inc/MantidKernel/NexusDescriptor.h

@@ -98,8 +98,8 @@ class MANTID_KERNEL_DLL NexusDescriptor {
   bool classTypeExists(const std::string &classType) const;
 
 private:
-  DISABLE_DEFAULT_CONSTRUCT(NexusDescriptor);
-  DISABLE_COPY_AND_ASSIGN(NexusDescriptor);
+  DISABLE_DEFAULT_CONSTRUCT(NexusDescriptor)
+  DISABLE_COPY_AND_ASSIGN(NexusDescriptor)
 
   /// Initialize object with filename
   void initialize(const std::string &filename);

Code/Mantid/Framework/Kernel/inc/MantidKernel/PseudoRandomNumberGenerator.h

@@ -51,7 +51,7 @@ class MANTID_KERNEL_DLL PseudoRandomNumberGenerator
   virtual void generateNextPoint();
 
 private:
-  DISABLE_COPY_AND_ASSIGN(PseudoRandomNumberGenerator);
+  DISABLE_COPY_AND_ASSIGN(PseudoRandomNumberGenerator)
 };
 }
 }

Code/Mantid/Framework/Kernel/inc/MantidKernel/SobolSequence.h

@@ -57,8 +57,8 @@ class MANTID_KERNEL_DLL SobolSequence : public QuasiRandomNumberSequence {
   void restore();
 
 private:
-  DISABLE_DEFAULT_CONSTRUCT(SobolSequence);
-  DISABLE_COPY_AND_ASSIGN(SobolSequence);
+  DISABLE_DEFAULT_CONSTRUCT(SobolSequence)
+  DISABLE_COPY_AND_ASSIGN(SobolSequence)
 
   /// Set the number of dimensions
   void setNumberOfDimensions(const unsigned int ndims);

Code/Mantid/Framework/Kernel/inc/MantidKernel/UnitLabel.h

@@ -80,7 +80,7 @@ class MANTID_KERNEL_DLL UnitLabel {
   operator std::string() const;
 
 private:
-  DISABLE_DEFAULT_CONSTRUCT(UnitLabel);
+  DISABLE_DEFAULT_CONSTRUCT(UnitLabel)
 
   /// Value of plain-text label
   std::string m_ascii;

Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/CachedExperimentInfo.h

@@ -78,8 +78,8 @@ class DLLExport CachedExperimentInfo {
   const Kernel::DblMatrix &sampleToDetectorTransform() const;
 
 private:
-  DISABLE_DEFAULT_CONSTRUCT(CachedExperimentInfo);
-  DISABLE_COPY_AND_ASSIGN(CachedExperimentInfo);
+  DISABLE_DEFAULT_CONSTRUCT(CachedExperimentInfo)
+  DISABLE_COPY_AND_ASSIGN(CachedExperimentInfo)
 
   /// Cache frequently used values
   void initCaches(const Geometry::Instrument_const_sptr &instrument,

Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/ForegroundModel.h

@@ -107,7 +107,7 @@ class DLLExport ForegroundModel : public API::ParamFunction {
                            double &arlu2, double &arlu3);
 
 private:
-  DISABLE_COPY_AND_ASSIGN(ForegroundModel);
+  DISABLE_COPY_AND_ASSIGN(ForegroundModel)
 
   /// Required by the interface
   void function(const Mantid::API::FunctionDomain &,

Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/ForegroundModelFactory.h

@@ -57,7 +57,7 @@ class MANTID_MDALGORITHMS_DLL ForegroundModelFactoryImpl
   friend struct Kernel::CreateUsingNew<ForegroundModelFactoryImpl>;
   /// Default constructor
   ForegroundModelFactoryImpl();
-  DISABLE_COPY_AND_ASSIGN(ForegroundModelFactoryImpl);
+  DISABLE_COPY_AND_ASSIGN(ForegroundModelFactoryImpl)
 
   // Do not allow the default create & createUnwrapped to be called
   using BaseClass::create;

Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/MDResolutionConvolution.h

@@ -117,7 +117,7 @@ class DLLExport MDResolutionConvolution : public API::ParamFunction {
   const API::IFunctionMD &getFittingFunction() const;
 
 private:
-  DISABLE_COPY_AND_ASSIGN(MDResolutionConvolution);
+  DISABLE_COPY_AND_ASSIGN(MDResolutionConvolution)
 
   /// Required for function interface
   void function(const Mantid::API::FunctionDomain &,

Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/MDResolutionConvolutionFactory.h

@@ -56,7 +56,7 @@ class MANTID_MDALGORITHMS_DLL MDResolutionConvolutionFactoryImpl
   friend struct Kernel::CreateUsingNew<MDResolutionConvolutionFactoryImpl>;
   /// Default constructor. Private for singleton holder
   MDResolutionConvolutionFactoryImpl();
-  DISABLE_COPY_AND_ASSIGN(MDResolutionConvolutionFactoryImpl);
+  DISABLE_COPY_AND_ASSIGN(MDResolutionConvolutionFactoryImpl)
 
   // Do not allow the default create & createUnwrapped to be called
   using BaseClass::create;

Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/Resolution/ModeratorChopperResolution.h

@@ -57,8 +57,8 @@ class DLLExport ModeratorChopperResolution {
   double energyWidth(const double deltaE) const;
 
 private:
-  DISABLE_DEFAULT_CONSTRUCT(ModeratorChopperResolution);
-  DISABLE_COPY_AND_ASSIGN(ModeratorChopperResolution);
+  DISABLE_DEFAULT_CONSTRUCT(ModeratorChopperResolution)
+  DISABLE_COPY_AND_ASSIGN(ModeratorChopperResolution)
 
   /// Store required cached variables
   void initCaches();

Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/Quantification/Resolution/TobyFitResolutionModel.h

@@ -77,7 +77,7 @@ class DLLExport TobyFitResolutionModel : public MDResolutionConvolution {
                         const size_t eventIndex) const;
 
 private:
-  DISABLE_COPY_AND_ASSIGN(TobyFitResolutionModel);
+  DISABLE_COPY_AND_ASSIGN(TobyFitResolutionModel)
 
   friend class TobyFitYVector;
 

Code/Mantid/Framework/PythonInterface/inc/MantidPythonInterface/api/FitFunctions/IFunction1DAdapter.h

@@ -62,8 +62,8 @@ class IFunction1DAdapter : public virtual API::ParamFunction,
 
 private:
   /// The PyObject must be supplied to construct the object
-  DISABLE_DEFAULT_CONSTRUCT(IFunction1DAdapter);
-  DISABLE_COPY_AND_ASSIGN(IFunction1DAdapter);
+  DISABLE_DEFAULT_CONSTRUCT(IFunction1DAdapter)
+  DISABLE_COPY_AND_ASSIGN(IFunction1DAdapter)
 
   /// Flag if the functionDeriv1D method is overridden (avoids multiple checks)
   bool m_derivOveridden;

Code/Mantid/Framework/PythonInterface/inc/MantidPythonInterface/api/FitFunctions/IFunctionAdapter.h

@@ -106,8 +106,8 @@ class IFunctionAdapter : virtual public API::IFunction {
 
 private:
   /// The PyObject must be supplied to construct the object
-  DISABLE_DEFAULT_CONSTRUCT(IFunctionAdapter);
-  DISABLE_COPY_AND_ASSIGN(IFunctionAdapter);
+  DISABLE_DEFAULT_CONSTRUCT(IFunctionAdapter)
+  DISABLE_COPY_AND_ASSIGN(IFunctionAdapter)
 
   /// The name of the function
   std::string m_name;

Code/Mantid/Framework/PythonInterface/inc/MantidPythonInterface/api/FitFunctions/IPeakFunctionAdapter.h

@@ -87,8 +87,8 @@ class IPeakFunctionAdapter : public virtual API::IPeakFunction,
 
 private:
   /// The PyObject must be supplied to construct the object
-  DISABLE_DEFAULT_CONSTRUCT(IPeakFunctionAdapter);
-  DISABLE_COPY_AND_ASSIGN(IPeakFunctionAdapter);
+  DISABLE_DEFAULT_CONSTRUCT(IPeakFunctionAdapter)
+  DISABLE_COPY_AND_ASSIGN(IPeakFunctionAdapter)
 };
 }
 }

Code/Mantid/Framework/PythonInterface/inc/MantidPythonInterface/api/PythonAlgorithm/AlgorithmAdapter.h

@@ -123,8 +123,8 @@ class AlgorithmAdapter : public BaseAlgorithm {
 
 private:
   /// The PyObject must be supplied to construct the object
-  DISABLE_DEFAULT_CONSTRUCT(AlgorithmAdapter);
-  DISABLE_COPY_AND_ASSIGN(AlgorithmAdapter);
+  DISABLE_DEFAULT_CONSTRUCT(AlgorithmAdapter)
+  DISABLE_COPY_AND_ASSIGN(AlgorithmAdapter)
 
   /// Private init for this algorithm
   virtual void init();

Code/Mantid/Framework/PythonInterface/inc/MantidPythonInterface/api/PythonAlgorithm/DataProcessorAdapter.h

@@ -100,8 +100,8 @@ class DataProcessorAdapter
 
 private:
   /// The PyObject must be supplied to construct the object
-  DISABLE_DEFAULT_CONSTRUCT(DataProcessorAdapter);
-  DISABLE_COPY_AND_ASSIGN(DataProcessorAdapter);
+  DISABLE_DEFAULT_CONSTRUCT(DataProcessorAdapter)
+  DISABLE_COPY_AND_ASSIGN(DataProcessorAdapter)
 };
 }
 }

Code/Mantid/MantidPlot/src/PlotDialog.h

@@ -181,7 +181,7 @@ protected slots:
   ColorMapEditor *colorMapEditor;
   QPushButton* mSelectColormap;
   QString mCurrentColorMap;
-  QWidget *curvePlotTypeBox, *layerPage, *layerGeometryPage, *piePage, *fontsPage, *printPage, *contourLinesPage;;
+  QWidget *curvePlotTypeBox, *layerPage, *layerGeometryPage, *piePage, *fontsPage, *printPage, *contourLinesPage;
   QTreeWidget* listBox;
   QCheckBox *boxAntialiasing, *boxAll, *boxScaleLayers, *boxPrintCrops;
   ColorButton *boxBorderColor, *boxBackgroundColor, *boxCanvasColor, *boxCanvasFrameColor;
@@ -236,7 +236,7 @@ protected slots:
   QLabel *boxRangeLabel, *whiskerCntLabel, *boxCntLabel;
   QGroupBox *GroupBoxVectEnd;
   QComboBox *vectPosBox, *boxXAxis, *boxYAxis, *colorScaleBox;//, *boxContourStyle;
-  PenStyleBox	*penContourStyle,*boxContourStyle;;
+  PenStyleBox	*penContourStyle,*boxContourStyle;
   QSpinBox *levelsBox, *colorScaleWidthBox;
   DoubleSpinBox *contourWidthBox;
   QGroupBox *levelsGroupBox, *axisScaleBox, *imageGroupBox;

Code/Mantid/MantidPlot/src/PythonScript.cpp

@@ -686,7 +686,7 @@ namespace
     }
   private:
     InstallTrace();
-    Q_DISABLE_COPY(InstallTrace);
+    Q_DISABLE_COPY(InstallTrace)
     PyObject *m_sipWrappedScript;
   };
 }

Code/Mantid/MantidPlot/src/PythonThreading.h

@@ -18,7 +18,7 @@ struct GlobalInterpreterLock
     PyGILState_Release(m_state);
   }
 private:
-  Q_DISABLE_COPY(GlobalInterpreterLock);
+  Q_DISABLE_COPY(GlobalInterpreterLock)
   /// Current GIL state
   PyGILState_STATE m_state;
 };

Code/Mantid/MantidPlot/src/ScriptFileInterpreter.h

@@ -123,7 +123,7 @@ private slots:
   void setStoppedStatus();
 
 private:
-  Q_DISABLE_COPY(ScriptFileInterpreter);
+  Q_DISABLE_COPY(ScriptFileInterpreter)
   void setupChildWidgets();
 
   void setupEditor(const ScriptingEnv & environ, const QString & identifier);

Code/Mantid/MantidQt/API/inc/MantidQtAPI/PlotAxis.h

@@ -50,7 +50,7 @@ namespace MantidQt
       QString title() const;
 
     private:
-      DISABLE_DEFAULT_CONSTRUCT(PlotAxis);
+      DISABLE_DEFAULT_CONSTRUCT(PlotAxis)
 
       /// Creates a title suitable for an axis attached to the given index
       void titleFromIndex(const Mantid::API::IMDWorkspace & workspace,

Code/Mantid/MantidQt/API/inc/MantidQtAPI/QtSignalChannel.h

@@ -66,7 +66,7 @@ namespace MantidQt
       void messageReceived(const Message & msg);
 
     private:
-      Q_DISABLE_COPY(QtSignalChannel);
+      Q_DISABLE_COPY(QtSignalChannel)
 
       /// Optional source (use std::string to avoid conversion in comparison)
       QString m_source;

Code/Mantid/MantidQt/API/inc/MantidQtAPI/RepoModel.h

@@ -223,7 +223,7 @@ const QString DELETABLEENTRY = "deletable";
     /// auxiliary method to help populating the model
     RepoItem * getParent(const QString & folder, QList<RepoItem*>&parents);
 
-    Q_DISABLE_COPY(RepoModel);
+    Q_DISABLE_COPY(RepoModel)
 
     /// auxiliary method to deal with exceptions
     void handleExceptions(const Mantid::API::ScriptRepoException & ex, 

Code/Mantid/MantidQt/API/inc/MantidQtAPI/SignalRange.h

@@ -47,7 +47,7 @@ namespace MantidQt
       QwtDoubleInterval interval() const;
 
     private:
-      DISABLE_DEFAULT_CONSTRUCT(SignalRange);
+      DISABLE_DEFAULT_CONSTRUCT(SignalRange)
 
       /// Find the min/max signal values in the entire workspace
       void findFullRange(const Mantid::API::IMDWorkspace & workspace,