Refs #5827 try Itransformscale and children only

mantidproject · Sep 3, 2012 · 0c4e9c5 · 0c4e9c5
1 parent a2670ed
commit 0c4e9c5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/Code/Mantid/Framework/API/CMakeLists.txt b/Code/Mantid/Framework/API/CMakeLists.txt
@@ -3,7 +3,7 @@ set ( SRC_FILES
 #    src/GridDomain1D.cpp
 #    src/TransformScaleFactory.cpp
     src/LinearScale.cpp
-#    src/LogarithmScale.cpp
+    src/LogarithmScale.cpp
 	src/Algorithm.cpp
 	src/AlgorithmFactory.cpp
 	src/AlgorithmHasProperty.cpp
@@ -120,7 +120,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
@@ -50,7 +50,7 @@ class MANTID_API_DLL ITransformScale
   virtual void transform( std::vector<double> &gd ) = 0;
 
 protected:
-  static Kernel::Logger& g_log;
+  static Mantid::Kernel::Logger& g_log;
 }; // class ITransformScale
 
 /// typedef for a shared pointer

diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/LogarithmScale.h b/Code/Mantid/Framework/API/inc/MantidAPI/LogarithmScale.h
@@ -45,7 +45,7 @@ class MANTID_API_DLL LogarithmScale : public ITransformScale
 {
 public:
   LogarithmScale() : m_base(M_E) {};
-  ~LogarithmScale();
+  ~LogarithmScale() {};
   const std::string name() const { return "LogarithmScale"; }
   void transform( std::vector<double> &gd );
   void setBase( double &base);

diff --git a/Code/Mantid/Framework/API/src/LogarithmScale.cpp b/Code/Mantid/Framework/API/src/LogarithmScale.cpp
@@ -13,7 +13,7 @@ namespace Mantid
 namespace API
 {
 
-DECLARE_TRANSFORMSCALE(LogarithmScale);
+//DECLARE_TRANSFORMSCALE(LogarithmScale);
 
 void LogarithmScale::setBase( double &base)
 {