refs #4201 fixing unix warnings

mantidproject · Nov 29, 2011 · 68eb3ea · 68eb3ea
1 parent 6a9ddcc
commit 68eb3ea
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 14 deletions.
diff --git a/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToQNDany.h b/Code/Mantid/Framework/MDAlgorithms/inc/MantidMDAlgorithms/ConvertToQNDany.h
@@ -136,15 +136,16 @@ namespace MDAlgorithms
    /// map to select an workspace
     std::map<size_t, pWSCreator> ws_creator;
   private: 
-    /// template defines common interface to common part of the algorithm, where all variables needed within the loop calculated outside of the loop
+    /// template defines common interface to common part of the algorithm, where all variables
+   ///  needed within the loop calculated outside of the loop. In addition it caluclates the property-dependant coordinates 
     template<Q_state Q>
-    void calc_generic_variables(std::vector<coord_t> &Coord, size_t nd){}
-    /// template generalizes the code to calculate generic Y-variables within external loop. 
+    void calc_generic_variables(std::vector<coord_t> &, size_t ){}
+    /// template generalizes the code to calculate Y-variables within the external loop. 
     template<Q_state Q>
-    void calculate_y_coordinate(std::vector<coord_t> &Coord,size_t i){}
+    void calculate_y_coordinate(std::vector<coord_t> &,size_t ){}
     /// template generalizes the code to calculate all remaining variables within the inner loop
     template<Q_state Q>
-    bool calculate_ND_coordinates(const MantidVec& ,size_t ,size_t ,std::vector<coord_t> &Coord){return false;}
+    bool calculate_ND_coordinates(const MantidVec& ,size_t ,size_t ,std::vector<coord_t> &){return false;}
    /// generig template to convert to any Dimensions workspace;
     template<size_t nd,Q_state Q>
     void processQND(API::IMDEventWorkspace *const pOutWs);    

diff --git a/Code/Mantid/Framework/MDAlgorithms/src/ConvertToQNDany.cpp b/Code/Mantid/Framework/MDAlgorithms/src/ConvertToQNDany.cpp
@@ -429,36 +429,30 @@ ConvertToQNDany::fillAddProperties(std::vector<coord_t> &Coord,size_t nd,size_t
         }  
 }
 
-#undef NOQ
-#undef MODQ
-#undef Q3D_
 
-#define NOQ
 template void ConvertToQNDany::processQND<2,NoQ>(API::IMDEventWorkspace *const);
 template void ConvertToQNDany::processQND<3,NoQ>(API::IMDEventWorkspace *const);
 template void ConvertToQNDany::processQND<4,NoQ>(API::IMDEventWorkspace *const);
 template void ConvertToQNDany::processQND<5,NoQ>(API::IMDEventWorkspace *const);
 template void ConvertToQNDany::processQND<6,NoQ>(API::IMDEventWorkspace *const);
 template void ConvertToQNDany::processQND<7,NoQ>(API::IMDEventWorkspace *const);
 template void ConvertToQNDany::processQND<8,NoQ>(API::IMDEventWorkspace *const);
-#undef  NOQ
-#define MODQ
+
 template void ConvertToQNDany::processQND<2,modQ>(API::IMDEventWorkspace *const);
 template void ConvertToQNDany::processQND<3,modQ>(API::IMDEventWorkspace *const);
 template void ConvertToQNDany::processQND<4,modQ>(API::IMDEventWorkspace *const);
 template void ConvertToQNDany::processQND<5,modQ>(API::IMDEventWorkspace *const);
 template void ConvertToQNDany::processQND<6,modQ>(API::IMDEventWorkspace *const);
 template void ConvertToQNDany::processQND<7,modQ>(API::IMDEventWorkspace *const);
 template void ConvertToQNDany::processQND<8,modQ>(API::IMDEventWorkspace *const);
-#undef  MODQ
-#define Q3D_
+
 template void ConvertToQNDany::processQND<3,Q3D>(API::IMDEventWorkspace *const);
 template void ConvertToQNDany::processQND<4,Q3D>(API::IMDEventWorkspace *const);
 template void ConvertToQNDany::processQND<5,Q3D>(API::IMDEventWorkspace *const);
 template void ConvertToQNDany::processQND<6,Q3D>(API::IMDEventWorkspace *const);
 template void ConvertToQNDany::processQND<7,Q3D>(API::IMDEventWorkspace *const);
 template void ConvertToQNDany::processQND<8,Q3D>(API::IMDEventWorkspace *const);
-#undef  Q3D_
+
 template   API::IMDEventWorkspace_sptr  ConvertToQNDany::createEmptyEventWS<2>(size_t ,size_t ,size_t );
 template   API::IMDEventWorkspace_sptr  ConvertToQNDany::createEmptyEventWS<3>(size_t ,size_t ,size_t );
 template   API::IMDEventWorkspace_sptr  ConvertToQNDany::createEmptyEventWS<4>(size_t ,size_t ,size_t );