diff --git a/Code/Mantid/Framework/API/CMakeLists.txt b/Code/Mantid/Framework/API/CMakeLists.txt index da2061ec2d5ce7161c29eba82af608ae2fbfdea9..39f2705f5e144be6cadec684d332244971f12358 100644 --- a/Code/Mantid/Framework/API/CMakeLists.txt +++ b/Code/Mantid/Framework/API/CMakeLists.txt @@ -4,7 +4,7 @@ set ( SRC_FILES src/ITransformScale.cpp # src/TransformScaleFactory.cpp src/LinearScale.cpp -# src/LogarithmScale.cpp + src/LogarithmScale.cpp src/Algorithm.cpp src/AlgorithmFactory.cpp src/AlgorithmHasProperty.cpp @@ -121,7 +121,7 @@ set ( INC_FILES inc/MantidAPI/ITransformScale.h # inc/MantidAPI/TransformScaleFactory.h inc/MantidAPI/LinearScale.h -# inc/MantidAPI/LogarithmScale.h + inc/MantidAPI/LogarithmScale.h inc/MantidAPI/Algorithm.h inc/MantidAPI/AlgorithmFactory.h inc/MantidAPI/AlgorithmHasProperty.h diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/ITransformScale.h b/Code/Mantid/Framework/API/inc/MantidAPI/ITransformScale.h index c230807c234b25d415d76f9adc9c83d7fa3b2275..11a1ed7f1104e1f9a4efe305300952f896dd0e0c 100644 --- a/Code/Mantid/Framework/API/inc/MantidAPI/ITransformScale.h +++ b/Code/Mantid/Framework/API/inc/MantidAPI/ITransformScale.h @@ -43,7 +43,7 @@ namespace API class MANTID_API_DLL ITransformScale { public: - ITransformScale(); + ITransformScale() {}; /// Virtual destructor needed for an abstract class virtual ~ITransformScale() {}; virtual const std::string name() const { return "ITransformScale"; } diff --git a/Code/Mantid/Framework/API/src/ITransformScale.cpp b/Code/Mantid/Framework/API/src/ITransformScale.cpp index 78a58e2338d6b99f39dde1fad7aed39bb5cbee72..4c93b46e6afea63bcadc0b868f79995e6c36531f 100644 --- a/Code/Mantid/Framework/API/src/ITransformScale.cpp +++ b/Code/Mantid/Framework/API/src/ITransformScale.cpp @@ -8,7 +8,7 @@ namespace Mantid { namespace API { -Kernel::Logger& g_log = Kernel::Logger::get("ITransformScale"); +Kernel::Logger& ITransformScale::g_log = Kernel::Logger::get("ITransformScale"); } // namespace API } // namespace Mantid diff --git a/Code/Mantid/Framework/API/src/LogarithmScale.cpp b/Code/Mantid/Framework/API/src/LogarithmScale.cpp index a599c553427aa579fc1a7e37948c18216fa31801..b436795f5bd14e22bb2e943e75c83f339add96d6 100644 --- a/Code/Mantid/Framework/API/src/LogarithmScale.cpp +++ b/Code/Mantid/Framework/API/src/LogarithmScale.cpp @@ -6,7 +6,7 @@ #include <stdexcept> #include "MantidAPI/LogarithmScale.h" -#include "MantidAPI/TransformScaleFactory.h" +//#include "MantidAPI/TransformScaleFactory.h" namespace Mantid {