refs #4401 Fixing (hopefully) Unix error

mantidproject · Apr 24, 2012 · c372a49 · c372a49
1 parent 1e5ecc6
commit c372a49
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToMDEventsTransfNoQ.h b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToMDEventsTransfNoQ.h
@@ -45,8 +45,8 @@ namespace ConvertToMD
 // ---->    NoQ
 // NoQ,ANY_Mode -- no units conversion. This templates just copies the data into MD events and not doing any momentum transformations
 //
-template<AnalMode MODE,CnvrtUnits CONV,XCoordType Type,SampleType Sample> 
-struct CoordTransformer<NoQ,MODE,CONV,Type,Sample>
+template<ConvertToMD::AnalMode MODE,ConvertToMD::CnvrtUnits CONV,ConvertToMD::XCoordType Type,ConvertToMD::SampleType Sample> 
+struct CoordTransformer<ConvertToMD::NoQ,MODE,CONV,Type,Sample>
 {
     inline bool calcGenericVariables(std::vector<coord_t> &Coord, size_t nd)    
     {

diff --git a/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToMDEventsTransfQ3D.h b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToMDEventsTransfQ3D.h
@@ -38,8 +38,8 @@ namespace ConvertToMD
         Code Documentation is available at: <http://doxygen.mantidproject.org>
 */
 
-template<AnalMode MODE,CnvrtUnits CONV,XCoordType Type,SampleType Sample> 
-struct CoordTransformer<Q3D,MODE,CONV,Type,Sample>
+template<ConvertToMD::AnalMode MODE,ConvertToMD::CnvrtUnits CONV,ConvertToMD::XCoordType TYPE,ConvertToMD::SampleType SAMPLE> 
+struct CoordTransformer<ConvertToMD::Q3D,MODE,CONV,TYPE,SAMPLE>
 {
     inline bool calcGenericVariables(std::vector<coord_t> &Coord, size_t nd)
     {
@@ -123,13 +123,13 @@ struct CoordTransformer<Q3D,MODE,CONV,Type,Sample>
     // Calling Mantid algorithm
     IConvertToMDEventsMethods *pHost;
    // class which would convert units
-    UnitsConverter<CONV,Type> CONV_UNITS_FROM;
+    UnitsConverter<CONV,TYPE> CONV_UNITS_FROM;
 
 };
 
 // Elastic
-template<CnvrtUnits CONV,XCoordType Type,SampleType Sample> 
-struct CoordTransformer<Q3D,Elastic,CONV,Type,Sample>
+template<ConvertToMD::CnvrtUnits CONV,ConvertToMD::XCoordType TYPE,ConvertToMD::SampleType SAMPLE> 
+struct CoordTransformer<ConvertToMD::Q3D,Elastic,CONV,TYPE,SAMPLE>
 {
     inline bool calcGenericVariables(std::vector<coord_t> &Coord, size_t nd)
     {
@@ -196,7 +196,7 @@ struct CoordTransformer<Q3D,Elastic,CONV,Type,Sample>
     // pointer to the algoritm, which calls all these transformations
     IConvertToMDEventsMethods *pHost;  
     // class which would convert units
-    UnitsConverter<CONV,Type> CONV_UNITS_FROM;
+    UnitsConverter<CONV,TYPE> CONV_UNITS_FROM;
 
 };