clang-format 3.6 changes.

Framework/PythonInterface/mantid/api/src/Exports/Algorithm.cpp

@@ -46,24 +46,22 @@ typedef void (*declarePropertyType4)(boost::python::object &self,
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunused-local-typedef"
 #endif
-    // Overload types
-    BOOST_PYTHON_FUNCTION_OVERLOADS(declarePropertyType1_Overload,
-                                    PythonAlgorithm::declarePyAlgProperty, 2, 3)
-        BOOST_PYTHON_FUNCTION_OVERLOADS(declarePropertyType2_Overload,
-                                        PythonAlgorithm::declarePyAlgProperty,
-                                        3, 6)
-            BOOST_PYTHON_FUNCTION_OVERLOADS(
-                declarePropertyType3_Overload,
-                PythonAlgorithm::declarePyAlgProperty, 4, 5)
+// Overload types
+BOOST_PYTHON_FUNCTION_OVERLOADS(declarePropertyType1_Overload,
+                                PythonAlgorithm::declarePyAlgProperty, 2, 3)
+BOOST_PYTHON_FUNCTION_OVERLOADS(declarePropertyType2_Overload,
+                                PythonAlgorithm::declarePyAlgProperty, 3, 6)
+BOOST_PYTHON_FUNCTION_OVERLOADS(declarePropertyType3_Overload,
+                                PythonAlgorithm::declarePyAlgProperty, 4, 5)
 #ifdef __clang__
 #pragma clang diagnostic pop
 #endif
-    /**
-     * Map a CancelException to a Python KeyboardInterupt
-     * @param exc A cancel exception to translate. Unused here as the message is
-     * ignored
-     */
-    void translateCancel(const Algorithm::CancelException &exc) {
+/**
+ * Map a CancelException to a Python KeyboardInterupt
+ * @param exc A cancel exception to translate. Unused here as the message is
+ * ignored
+ */
+void translateCancel(const Algorithm::CancelException &exc) {
   UNUSED_ARG(exc);
   PyErr_SetString(PyExc_KeyboardInterrupt, "");
 }

Framework/PythonInterface/mantid/api/src/Exports/IFunction.cpp

@@ -38,11 +38,11 @@ typedef void (IFunction::*setParameterType1)(size_t, const double &value, bool);
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunused-local-typedef"
 #endif
-    BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(setParameterType1_Overloads,
-                                           setParameter, 2, 3)
-    // setProperty(index,value,explicit)
-    typedef void (IFunction::*setParameterType2)(const std::string &,
-                                                 const double &value, bool);
+BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(setParameterType1_Overloads,
+                                       setParameter, 2, 3)
+// setProperty(index,value,explicit)
+typedef void (IFunction::*setParameterType2)(const std::string &,
+                                             const double &value, bool);
 BOOST_PYTHON_MEMBER_FUNCTION_OVERLOADS(setParameterType2_Overloads,
                                        setParameter, 2, 3)
 #ifdef __clang__