diff --git a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/UserFunction.h b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/UserFunction.h index df17b444b72a8c8b3a8d60eb359f37b834b8024f..e4438d0374c080b0286385abf71eaf7d6d68fa2f 100644 --- a/Framework/CurveFitting/inc/MantidCurveFitting/Functions/UserFunction.h +++ b/Framework/CurveFitting/inc/MantidCurveFitting/Functions/UserFunction.h @@ -8,12 +8,6 @@ #include "MantidAPI/IFunction1D.h" #include <boost/shared_array.hpp> -namespace Mantid { -namespace Kernel { -class MuParserExtd; -} -} - namespace mu { class Parser; } @@ -90,7 +84,6 @@ private: /// The formula std::string m_formula; /// extended muParser instance - // Mantid::Kernel::MuParserExtd *m_parser; mu::Parser *m_parser; /// Used as 'x' variable in m_parser. mutable double m_x; diff --git a/Framework/CurveFitting/src/Functions/UserFunction.cpp b/Framework/CurveFitting/src/Functions/UserFunction.cpp index 1062456d6fdb6146dc0a9cc606bc0d4f77a64dc6..179c1ab7317e2eecdebd97be494ab4bebf0ab543 100644 --- a/Framework/CurveFitting/src/Functions/UserFunction.cpp +++ b/Framework/CurveFitting/src/Functions/UserFunction.cpp @@ -3,7 +3,6 @@ //---------------------------------------------------------------------- #include "MantidCurveFitting/Functions/UserFunction.h" #include "MantidAPI/FunctionFactory.h" -//#include "MantidKernel/Math/MuParserExtd.h" #include "MantidAPI/MuParserUtils.h" #include <boost/tokenizer.hpp> #include "MantidGeometry/muParser_Silent.h" @@ -26,7 +25,6 @@ UserFunction::UserFunction() : m_parser(new mu::Parser()), m_x(0.), m_x_set(false) { extraOneVarFunctions(*m_parser); } -// : m_parser(new Mantid::Kernel::MuParserExtd()), m_x(0.), m_x_set(false) {} /// Destructor UserFunction::~UserFunction() { delete m_parser; } @@ -68,7 +66,6 @@ void UserFunction::setAttribute(const std::string &attName, clearAllParameters(); try { - // Mantid::Kernel::MuParserExtd tmp_parser; mu::Parser tmp_parser; extraOneVarFunctions(tmp_parser); tmp_parser.SetVarFactory(AddVariable, this);