Merge remote-tracking branch 'origin/template_extension' into ornl-next

Author: peterfpeterson

.gitignore

@@ -16,6 +16,8 @@ compile_commands.json
 # Ignore CMakeUserPresets
 CMakeUserPresets.json
 
+# prefer hxx for template definition files
+*.tcc
 
 # Compiled Object files
 *.slo

Framework/API/CMakeLists.txt

@@ -164,7 +164,7 @@ set(SRC_FILES
 set(INC_FILES
     inc/MantidAPI/ADSValidator.h
     inc/MantidAPI/Algorithm.h
-    inc/MantidAPI/Algorithm.tcc
+    inc/MantidAPI/Algorithm.hxx
     inc/MantidAPI/AlgorithmFactory.h
     inc/MantidAPI/AlgorithmFactoryObserver.h
     inc/MantidAPI/AlgorithmHasProperty.h
@@ -361,7 +361,7 @@ set(INC_FILES
     inc/MantidAPI/WorkspaceNearestNeighbours.h
     inc/MantidAPI/WorkspaceOpOverloads.h
     inc/MantidAPI/WorkspaceProperty.h
-    inc/MantidAPI/WorkspaceProperty.tcc
+    inc/MantidAPI/WorkspaceProperty.hxx
     inc/MantidAPI/WorkspacePropertyUtils.h
     inc/MantidAPI/WorkspaceUnitValidator.h
     inc/MantidAPI/Workspace_fwd.h

Framework/API/inc/MantidAPI/Algorithm.tcc renamed to Framework/API/inc/MantidAPI/Algorithm.hxx

@@ -29,15 +29,15 @@ void setWorkspaceProperty(Mantid::API::WorkspaceProperty<T1> *wsProp, const T2 &
 namespace Mantid {
 namespace API {
 /** Declare a property which defines the workspace and allowed index types, as
-* well as a property for capturing the indices all at once. This method is
-* only enabled if T is convertible to MatrixWorkspace.
-@param propertyName Name of property which will be reserved
-@param allowedIndexTypes combination of allowed index types. Default
-IndexType::WorkspaceIndex
-@param wsPropArgs a parameter pack of arguments forwarded to WorkspaceProperty.
-Can contain PropertyMode, LockMode, and validators.
-@param doc Property documentation string.
-*/
+ * well as a property for capturing the indices all at once. This method is
+ * only enabled if T is convertible to MatrixWorkspace.
+ * The AllowedIndexTypes combination of allowed index types. Default IndexType::WorkspaceIndex
+ *
+ * @param propertyName Name of property which will be reserved
+ * @param wsPropArgs a parameter pack of arguments forwarded to WorkspaceProperty.
+ * Can contain PropertyMode, LockMode, and validators.
+ * @param doc Property documentation string.
+ */
 template <typename T, const int AllowedIndexTypes, typename... WSPropArgs, typename>
 void Algorithm::declareWorkspaceInputProperties(const std::string &propertyName, const std::string &doc,
                                                 WSPropArgs &&...wsPropArgs) {

Framework/API/inc/MantidAPI/IFunction1D.tcc renamed to Framework/API/inc/MantidAPI/IFunction1D.hxx

@@ -43,7 +43,7 @@
 #include <utility>
 
 // Index property handling template definitions
-#include "MantidAPI/Algorithm.tcc"
+#include "MantidAPI/Algorithm.hxx"
 
 using namespace Mantid::Kernel;
 

Framework/API/inc/MantidAPI/WorkspaceProperty.tcc renamed to Framework/API/inc/MantidAPI/WorkspaceProperty.hxx

@@ -13,7 +13,7 @@
 #include "MantidAPI/ConstraintFactory.h"
 #include "MantidAPI/Expression.h"
 #include "MantidAPI/IConstraint.h"
-#include "MantidAPI/IFunction1D.tcc"
+#include "MantidAPI/IFunction1D.hxx"
 #include "MantidAPI/IFunctionWithLocation.h"
 #include "MantidAPI/Jacobian.h"
 #include "MantidAPI/MatrixWorkspace.h"

Framework/API/src/Algorithm.cpp

@@ -10,7 +10,7 @@
 #include "MantidAPI/IPeakFunction.h"
 #include "MantidAPI/FunctionFactory.h"
 #include "MantidAPI/FunctionParameterDecorator.h"
-#include "MantidAPI/IFunction1D.tcc"
+#include "MantidAPI/IFunction1D.hxx"
 #include "MantidAPI/Jacobian.h"
 #include "MantidAPI/PeakFunctionIntegrator.h"
 #include "MantidKernel/Exception.h"

Framework/API/src/IFunction1D.cpp

@@ -22,7 +22,7 @@
 #include "MantidAPI/WorkspaceGroup.h"
 
 // PropertyWithValue implementation
-#include "MantidKernel/PropertyWithValue.tcc"
+#include "MantidKernel/PropertyWithValue.hxx"
 
 namespace Mantid::Kernel {
 

Framework/API/src/IPeakFunction.cpp

@@ -15,7 +15,7 @@
 #include "MantidAPI/WorkspaceGroup.h"
 
 // WorkspaceProperty implementation
-#include "MantidAPI/WorkspaceProperty.tcc"
+#include "MantidAPI/WorkspaceProperty.hxx"
 
 namespace Mantid::API {
 ///@cond TEMPLATE