Commit c99e3ae2 authored by Gigg, Martyn Anthony's avatar Gigg, Martyn Anthony
Browse files

API & APITest compiles.

Refs #9059
parent 111e89d8
......@@ -62,7 +62,6 @@ set ( SRC_FILES
src/ISpectrum.cpp
src/ISplittersWorkspace.cpp
src/ITableWorkspace.cpp
src/ITransformScale.cpp
src/IkedaCarpenterModerator.cpp
src/ImmutableCompositeFunction.cpp
src/ImplicitFunctionParameterParserFactory.cpp
......
......@@ -224,18 +224,17 @@ public:
/// Returns the cancellation state
bool getCancel() const { return m_cancel; }
/// Returns a reference to the logger.
Kernel::Logger & getLogger() const { return g_log; }
///Logging can be disabled by passing a value of false
void setLogging(const bool value){g_log.setEnabled(value);}
void setLogging(const bool value) { g_log.setEnabled(value);}
///returns the status of logging, True = enabled
bool isLogging() const {return g_log.getEnabled();}
bool isLogging() const { return g_log.getEnabled();}
///sets the logging priority offset
void setLoggingOffset(const int value) {g_log.setLevelOffset(value);}
void setLoggingOffset(const int value) { g_log.setLevelOffset(value); }
///returns the logging priority offset
int getLoggingOffset() const {return g_log.getLevelOffset();}
/// Returns a reference to the logger.
Kernel::Logger& getLogger() const { return g_log; }
int getLoggingOffset() const { return g_log.getLevelOffset(); }
/// function returns an optional message that will be displayed in the default GUI, at the top.
......@@ -318,8 +317,6 @@ protected:
bool m_cancel;
/// Set if an exception is thrown, and not caught, within a parallel region
bool m_parallelException;
/// Reference to the logger class
Kernel::Logger& g_log;
friend class WorkspaceHistory; // Allow workspace history loading to adjust g_execCount
static size_t g_execCount; ///< Counter to keep track of algorithm execution order
......@@ -338,6 +335,10 @@ protected:
/// All the WorkspaceProperties that are Input or InOut. Set in execute()
std::vector<IWorkspaceProperty *> m_inputWorkspaceProps;
/// Logger for this algorithm
Kernel::Logger m_log;
Kernel::Logger &g_log;
private:
/// Private Copy constructor: NO COPY ALLOWED
Algorithm(const Algorithm&);
......@@ -355,7 +356,6 @@ private:
bool executeAsyncImpl(const Poco::Void & i);
// --------------------- Private Members -----------------------------------
/// Poco::ActiveMethod used to implement asynchronous execution.
Poco::ActiveMethod<bool, Poco::Void, Algorithm, Poco::ActiveStarter<Algorithm>> *m_executeAsync;
......
......@@ -10,7 +10,6 @@
#include "MantidAPI/DllConfig.h"
#include "MantidKernel/DynamicFactory.h"
#include "MantidKernel/SingletonHolder.h"
#include "MantidKernel/Logger.h"
namespace Mantid
{
......@@ -158,8 +157,6 @@ public:
std::string createName(const std::string&, const int&)const;
/// fills a set with the hidden categories
void fillHiddenCategories(std::set<std::string> *categorySet) const;
///static reference to the logger class
Kernel::Logger& g_log;
/// A typedef for the map of algorithm versions
typedef std::map<std::string, int> VersionMap;
......
......@@ -8,7 +8,6 @@
#include <string>
#include <Poco/NotificationCenter.h>
#include "MantidAPI/DllConfig.h"
#include "MantidKernel/Logger.h"
#include "MantidKernel/SingletonHolder.h"
#include "MantidAPI/Algorithm.h"
......@@ -91,8 +90,6 @@ private:
/// Unimplemented assignment operator
AlgorithmManagerImpl& operator =(const AlgorithmManagerImpl&);
/// Reference to the logger class
Kernel::Logger& g_log;
/// The maximum size of the algorithm store
int m_max_no_algs;
/// The list of managed algorithms
......
......@@ -185,9 +185,6 @@ namespace Mantid
/// Temporary holder of external observers wishing to subscribe
mutable std::vector<const Poco::AbstractObserver*> m_externalObservers;
/// Static refenence to the logger class
static Kernel::Logger& g_log;
};
} // namespace API
......
......@@ -25,14 +25,6 @@
namespace Mantid
{
//----------------------------------------------------------------------
// Forward declaration
//----------------------------------------------------------------------
namespace Kernel
{
class Logger;
}
namespace API
{
//----------------------------------------------------------------------
......@@ -79,8 +71,6 @@ namespace Mantid
virtual ~CatalogFactoryImpl();
/// Stores pointers to already created Catalog instances, with their name as the key
mutable std::map< std::string, boost::shared_ptr<ICatalog> > m_createdCatalogs;
/// Reference to the logger class
Kernel::Logger& m_log;
};
///Forward declaration of a specialisation of SingletonHolder for CatalogFactoryImpl (needed for dllexport/dllimport) .
......
......@@ -5,7 +5,6 @@
// Includes
//----------------------------------------------------------------------
#include "MantidAPI/DllConfig.h"
#include "MantidKernel/Logger.h"
#include <boost/shared_ptr.hpp>
#include <string>
......@@ -16,14 +15,6 @@
namespace Mantid
{
//----------------------------------------------------------------------
// Forward declarations
//----------------------------------------------------------------------
namespace Kernel
{
class Logger;
}
namespace API
{
/** \class Column
......@@ -188,8 +179,6 @@ protected:
friend class ColumnFactoryImpl;
friend class ITableWorkspace;
template<class T> friend class ColumnVector;
/// Logger
static Kernel::Logger& g_log;
};
/** @class Boolean
......
......@@ -11,22 +11,13 @@
namespace Mantid
{
//----------------------------------------------------------------------
// Forward declarations
//----------------------------------------------------------------------
namespace Kernel
{
class Logger;
}
namespace API
{
//----------------------------------------------------------------------
// Forward declarations
//----------------------------------------------------------------------
class Column;
}
namespace API
{
/** @class ColumnFactoryImpl
......@@ -74,8 +65,6 @@ namespace API
ColumnFactoryImpl& operator = (const ColumnFactoryImpl&);
///Private Destructor
virtual ~ColumnFactoryImpl();
///static reference to the logger class
Kernel::Logger& g_log;
};
......
......@@ -11,20 +11,12 @@
namespace Mantid
{
//----------------------------------------------------------------------
// Forward declarations
//----------------------------------------------------------------------
namespace Kernel
{
class Logger;
}
namespace API
{
//----------------------------------------------------------------------
// More forward declarations
// Forward declarations
//----------------------------------------------------------------------
class IConstraint;
class IFunction;
......@@ -79,10 +71,6 @@ namespace API
ConstraintFactoryImpl& operator = (const ConstraintFactoryImpl&);
///Private Destructor
virtual ~ConstraintFactoryImpl();
///static reference to the logger class
Kernel::Logger& g_log;
};
///Forward declaration of a specialisation of SingletonHolder for AlgorithmFactoryImpl (needed for dllexport/dllimport) and a typedef for it.
......
......@@ -63,9 +63,6 @@ namespace API
friend struct Mantid::Kernel::CreateUsingNew<CostFunctionFactoryImpl>;
/// Private Constructor for singleton class
CostFunctionFactoryImpl();
///static reference to the logger class
Kernel::Logger& g_log;
};
///Forward declaration of a specialisation of SingletonHolder for AlgorithmFactoryImpl (needed for dllexport/dllimport) and a typedef for it.
......
......@@ -137,9 +137,6 @@ namespace API
protected:
/// Static reference to the logger class
static Kernel::Logger& g_log;
/// Description of the source object
boost::shared_ptr<ModeratorModel> m_moderatorModel;
/// Description of the choppers for this experiment.
......
......@@ -4,8 +4,6 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
#include "MantidKernel/Logger.h"
#include "MantidKernel/InstrumentInfo.h"
#include "MantidKernel/SingletonHolder.h"
#include "MantidAPI/DllConfig.h"
#include "MantidAPI/IArchiveSearch.h"
......@@ -15,6 +13,13 @@
namespace Mantid
{
//---------------------------------------------------------------------------
// Forward declarations
//---------------------------------------------------------------------------
namespace Kernel
{
class InstrumentInfo;
}
namespace API
{
......@@ -80,9 +85,6 @@ namespace Mantid
std::string toUpper(const std::string &src) const;
/// glob option - set to case sensitive or insensitive
int m_globOption;
/// reference to the logger class
Mantid::Kernel::Logger& g_log;
};
///Forward declaration of a specialisation of SingletonHolder for AlgorithmFactoryImpl (needed for dllexport/dllimport) and a typedef for it.
......
......@@ -134,7 +134,7 @@ namespace Mantid
size_t m_totalSize;
/// Reference to a logger
Kernel::Logger & m_log;
mutable Kernel::Logger m_log;
};
///Forward declaration of a specialisation of SingletonHolder for FileLoaderRegistryImpl (needed for dllexport/dllimport) and a typedef for it.
......
......@@ -18,11 +18,6 @@
namespace Mantid
{
namespace Kernel
{
class Logger;
}
namespace API
{
//----------------------------------------------------------------------
......@@ -117,9 +112,6 @@ namespace Mantid
/// Silence NeXus output
void disableNexusOutput();
/// Reference to the logger class
Kernel::Logger& g_log;
#ifdef MPI_BUILD
/** Member variable that initialises the MPI environment on construction (in the
* FrameworkManager constructor) and finalises it on destruction.
......
......@@ -59,9 +59,6 @@ namespace API
friend struct Mantid::Kernel::CreateUsingNew<FuncMinimizerFactoryImpl>;
/// Private Constructor for singleton class
FuncMinimizerFactoryImpl();
///static reference to the logger class
Kernel::Logger& g_log;
};
///Forward declaration of a specialisation of SingletonHolder for AlgorithmFactoryImpl (needed for dllexport/dllimport) and a typedef for it.
......
......@@ -15,14 +15,6 @@
namespace Mantid
{
//----------------------------------------------------------------------
// Forward declarations
//----------------------------------------------------------------------
namespace Kernel
{
class Logger;
}
namespace API
{
......@@ -124,9 +116,6 @@ namespace API
/// Add a tie to the created function
void addTie(boost::shared_ptr<IFunction> fun,const Expression& expr)const;
/// Reference to the logger class
Kernel::Logger& g_log;
mutable std::map<std::string,std::vector<std::string>> m_cachedFunctionNames;
mutable Kernel::Mutex m_mutex;
};
......
......@@ -7,7 +7,6 @@
#include "MantidAPI/DllConfig.h"
#include "MantidAPI/IFunction.h"
#include "MantidKernel/PropertyWithValue.h"
#include "MantidKernel/Logger.h"
#include "MantidKernel/Exception.h"
#include <boost/shared_ptr.hpp>
......@@ -90,9 +89,6 @@ namespace Mantid
/// The function definition string (as used by the FunctionFactory)
std::string m_definition;
/// for access to logging streams
static Kernel::Logger& g_log;
};
......
......@@ -9,7 +9,6 @@
#include "MantidAPI/DllConfig.h"
#include "MantidAPI/FunctionDomain.h"
#include "MantidKernel/Logger.h"
namespace Mantid
{
......@@ -56,9 +55,6 @@ public:
/// re-scale all grids
void reScale( const std::string &scaling);
protected:
static Kernel::Logger& g_log;
private:
/// composition of grids
std::vector< boost::shared_ptr<GridDomain> > m_grids;
......
......@@ -10,7 +10,6 @@
#include "MantidAPI/FunctionValues.h"
#include "MantidAPI/Jacobian.h"
#include "MantidKernel/Matrix.h"
#include "MantidKernel/Logger.h"
#include "MantidKernel/Exception.h"
#include "MantidKernel/Unit.h"
......@@ -483,9 +482,6 @@ protected:
/// Pointer to the progress handler
Kernel::ProgressBase *m_progReporter;
/// Static reference to the logger class
static Kernel::Logger& g_log;
private:
/// The declared attributes
std::map<std::string, API::IFunction::Attribute> m_attrs;
......
......@@ -77,9 +77,6 @@ public:
protected:
/// Static reference to the logger class
static Kernel::Logger& g_log;
/// Making a friend
friend class CurveFitting::Fit;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment