Merge branch 'feature/7263_improve_load_selection_performance' into d…

…evelop Refs #7263 Conflicts: Code/Mantid/Framework/API/inc/MantidAPI/IFileLoader.h Code/Mantid/Framework/API/inc/MantidAPI/IHDFFileLoader.h Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadILL.h Code/Mantid/Framework/DataHandling/src/LoadILL.cpp Code/Mantid/Framework/DataHandling/src/LoadSassena.cpp
mantidproject · Jul 5, 2013 · 10264ab · 10264ab
2 parents 014f1fe + 04e1697
commit 10264ab
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/IFileLoader.h b/Code/Mantid/Framework/API/inc/MantidAPI/IFileLoader.h
@@ -36,6 +36,8 @@ namespace Mantid
     class MANTID_API_DLL IFileLoader : public Algorithm
     {
     public:
+      /// Virtual destructor (required by linker on some versions of OS X/Intel compiler)
+      virtual ~IFileLoader() {}
       /// Returns a confidence value that this algorithm can load a file
       virtual int confidence(Kernel::FileDescriptor & descriptor) const = 0;
     };

diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/IHDFFileLoader.h b/Code/Mantid/Framework/API/inc/MantidAPI/IHDFFileLoader.h
@@ -36,6 +36,8 @@ namespace Mantid
     class DLLExport IHDFFileLoader : public API::Algorithm
     {
     public:
+      /// Virtual destructor (required by linker on some versions of OS X/Intel compiler)
+      virtual ~IHDFFileLoader() {}
       /// Returns a confidence value that this algorithm can load a file
       virtual int confidence(Kernel::HDFDescriptor & descriptor) const = 0;
     };

diff --git a/Code/Mantid/Framework/DataHandling/src/LoadILL.cpp b/Code/Mantid/Framework/DataHandling/src/LoadILL.cpp
@@ -619,7 +619,7 @@ LoadILL::LoadILL() :
 			/ (2 * PhysicalConstants::NeutronMass * wavelength * wavelength
 					* 1e-20) / PhysicalConstants::meV;
       return e;
-}
+    }
 
 
 double LoadILL::getL1() {