refs #6856 minor warning ans suspicions for merge error

mantidproject · May 22, 2013 · 3082a78 · 3082a78
1 parent 8730c54
commit 3082a78
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/Code/Mantid/Framework/MDAlgorithms/src/ConvertToDiffractionMDWorkspace2.cpp b/Code/Mantid/Framework/MDAlgorithms/src/ConvertToDiffractionMDWorkspace2.cpp
@@ -104,8 +104,10 @@ namespace MDAlgorithms
       DisabledProperty():
           EnabledWhenProperty("NonExistingProperty",IS_DEFAULT)
       {};
-      virtual bool fulfillsCriterion(const IPropertyManager * algo) const
-      {return false;}
+      virtual bool fulfillsCriterion(const IPropertyManager * /*algo*/) const
+      {
+          return false;
+      }
   };
 
   //----------------------------------------------------------------------------------------------