Commit 9f44ec0b authored by LamarMoore's avatar LamarMoore Committed by Martyn Gigg
Browse files

Update to clang 5.0 (#23166)

Update to clang-format-5 and reformat the codebase 
parent d3adcace
......@@ -4,8 +4,8 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
#include "MantidKernel/TypedValidator.h"
#include "MantidAPI/DllConfig.h"
#include "MantidKernel/TypedValidator.h"
namespace Mantid {
namespace API {
......
......@@ -131,8 +131,8 @@ public:
std::string name() const override;
double progress; ///< Current progress. Value must be between 0 and 1.
std::string message; ///< Message sent with notification
double estimatedTime; ///<Estimated time to completion
int progressPrecision; ///<Digits of precision to the progress (after the
double estimatedTime; ///< Estimated time to completion
int progressPrecision; ///< Digits of precision to the progress (after the
/// decimal).
};
......
......@@ -4,12 +4,12 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
#include <vector>
#include <unordered_set>
#include <sstream>
#include "MantidAPI/DllConfig.h"
#include "MantidKernel/DynamicFactory.h"
#include "MantidKernel/SingletonHolder.h"
#include <sstream>
#include <unordered_set>
#include <vector>
namespace Mantid {
namespace API {
......@@ -184,6 +184,6 @@ namespace Kernel {
EXTERN_MANTID_API template class MANTID_API_DLL
Mantid::Kernel::SingletonHolder<Mantid::API::AlgorithmFactoryImpl>;
}
}
} // namespace Mantid
#endif /*MANTID_API_ALGORITHMFACTORY_H_*/
......@@ -53,7 +53,7 @@ private:
std::string m_propName;
};
} // namespace Mantid
} // namespace API
} // namespace Mantid
#endif /* MANTID_API_ALGORITHMHASPROPERTY_H_ */
......@@ -5,15 +5,15 @@
// Includes
//----------------------------------------------------------------------
#include "MantidAPI/DllConfig.h"
#include "MantidKernel/PropertyHistory.h"
#include "MantidKernel/DateAndTime.h"
#include "MantidKernel/PropertyHistory.h"
#include <nexus/NeXusFile.hpp>
#include <boost/bind.hpp>
#include <boost/function.hpp>
#include <ctime>
#include <vector>
#include <set>
#include <vector>
namespace Mantid {
namespace API {
......@@ -31,7 +31,7 @@ template <class T> struct CompareHistory {
return (*lhs) < (*rhs);
}
};
}
} // namespace Detail
// typedefs for algorithm history pointers
using AlgorithmHistory_sptr = boost::shared_ptr<AlgorithmHistory>;
......
......@@ -4,10 +4,10 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
#include <Poco/NotificationCenter.h>
#include "MantidAPI/Algorithm.h"
#include "MantidAPI/DllConfig.h"
#include "MantidKernel/SingletonHolder.h"
#include "MantidAPI/Algorithm.h"
#include <Poco/NotificationCenter.h>
#include <deque>
#include <mutex>
......@@ -112,6 +112,6 @@ namespace Kernel {
EXTERN_MANTID_API template class MANTID_API_DLL
Mantid::Kernel::SingletonHolder<Mantid::API::AlgorithmManagerImpl>;
}
}
} // namespace Mantid
#endif /* MANTID_API_ALGORITHMMANAGER_H_ */
......@@ -4,9 +4,9 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
#include "MantidAPI/DllConfig.h"
#include "MantidAPI/Algorithm.h"
#include "MantidAPI/AlgorithmManager.h"
#include "MantidAPI/DllConfig.h"
#include <Poco/NObserver.h>
namespace Mantid {
......
......@@ -2,8 +2,8 @@
#define MANTID_API_ALGORITHMPROPERTY_H_
#include "MantidAPI/DllConfig.h"
#include "MantidKernel/PropertyWithValue.h"
#include "MantidKernel/NullValidator.h"
#include "MantidKernel/PropertyWithValue.h"
namespace Mantid {
namespace API {
......
......@@ -21,7 +21,7 @@ namespace Poco {
template <class R, class A, class O, class S> class ActiveMethod;
template <class O> class ActiveStarter;
class Void;
}
} // namespace Poco
namespace Mantid {
namespace API {
......@@ -189,7 +189,7 @@ private:
const std::vector<std::string> m_seeAlso; ///< seeAlso of the real algorithm
const std::string m_alias; ///< alias to the algorithm
const std::string m_helpURL; ///< Optional documentation URL
const std::string m_summary; ///<Message to display in GUI and help.
const std::string m_summary; ///< Message to display in GUI and help.
const int m_version; ///< version of the real algorithm
mutable boost::shared_ptr<Algorithm>
......
......@@ -4,10 +4,10 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
#include "MantidKernel/DataService.h"
#include "MantidAPI/DllConfig.h"
#include "MantidKernel/SingletonHolder.h"
#include "MantidAPI/Workspace.h"
#include "MantidKernel/DataService.h"
#include "MantidKernel/SingletonHolder.h"
#include <Poco/AutoPtr.h>
......@@ -200,15 +200,15 @@ using WorkspaceAfterReplaceNotification_ptr =
using WorkspacePreDeleteNotification =
Mantid::Kernel::DataService<Mantid::API::Workspace>::PreDeleteNotification;
using WorkspacePreDeleteNotification_ptr =
const Poco::AutoPtr<Mantid::Kernel::DataService<
Mantid::API::Workspace>::PreDeleteNotification> &;
using WorkspacePreDeleteNotification_ptr = const Poco::AutoPtr<
Mantid::Kernel::DataService<Mantid::API::Workspace>::PreDeleteNotification>
&;
using WorkspacePostDeleteNotification =
Mantid::Kernel::DataService<Mantid::API::Workspace>::PostDeleteNotification;
using WorkspacePostDeleteNotification_ptr =
const Poco::AutoPtr<Mantid::Kernel::DataService<
Mantid::API::Workspace>::PostDeleteNotification> &;
using WorkspacePostDeleteNotification_ptr = const Poco::AutoPtr<
Mantid::Kernel::DataService<Mantid::API::Workspace>::PostDeleteNotification>
&;
using ClearADSNotification =
Mantid::Kernel::DataService<Mantid::API::Workspace>::ClearNotification;
......@@ -243,6 +243,6 @@ namespace Kernel {
EXTERN_MANTID_API template class MANTID_API_DLL
Mantid::Kernel::SingletonHolder<Mantid::API::AnalysisDataServiceImpl>;
}
}
} // namespace Mantid
#endif /*MANTID_KERNEL_ANALYSISDATASERVICE_H_*/
......@@ -6,8 +6,8 @@
//----------------------------------------------------------------------
#include "MantidAPI/DllConfig.h"
#include "MantidKernel/DynamicFactory.h"
#include "MantidKernel/SingletonHolder.h"
#include "MantidKernel/Logger.h"
#include "MantidKernel/SingletonHolder.h"
namespace Mantid {
namespace API {
......@@ -58,14 +58,14 @@ private:
using ArchiveSearchFactory =
Mantid::Kernel::SingletonHolder<ArchiveSearchFactoryImpl>;
}
}
} // namespace API
} // namespace Mantid
namespace Mantid {
namespace Kernel {
EXTERN_MANTID_API template class MANTID_API_DLL
Mantid::Kernel::SingletonHolder<Mantid::API::ArchiveSearchFactoryImpl>;
}
}
} // namespace Mantid
#endif // MANTID_API_ARCHIVESEARCHFACTORY_H_
#ifndef BOXCONTROLLER_H_
#define BOXCONTROLLER_H_
#include "MantidAPI/IBoxControllerIO.h"
#include "MantidKernel/DiskBuffer.h"
#include "MantidKernel/Exception.h"
#include "MantidKernel/System.h"
#include "MantidKernel/ThreadPool.h"
#include "MantidKernel/Exception.h"
#include "MantidAPI/IBoxControllerIO.h"
#include <nexus/NeXusFile.hpp>
#include <boost/optional.hpp>
......
......@@ -88,6 +88,6 @@ namespace Kernel {
EXTERN_MANTID_API template class MANTID_API_DLL
Mantid::Kernel::SingletonHolder<Mantid::API::CatalogFactoryImpl>;
}
}
} // namespace Mantid
#endif /*MANTID_API_CATALOGFACTORYIMPL_H_*/
#ifndef MANTID_ICAT_CATALOGMANAGERIMPL_H_
#define MANTID_ICAT_CATALOGMANAGERIMPL_H_
#include "MantidKernel/SingletonHolder.h"
#include "MantidAPI/ICatalog.h"
#include "MantidKernel/SingletonHolder.h"
#include <map>
#include <string>
......@@ -68,13 +68,13 @@ private:
};
using CatalogManager = Kernel::SingletonHolder<CatalogManagerImpl>;
}
}
} // namespace API
} // namespace Mantid
namespace Mantid {
namespace Kernel {
EXTERN_MANTID_API template class MANTID_API_DLL
Kernel::SingletonHolder<Mantid::API::CatalogManagerImpl>;
}
}
} // namespace Mantid
#endif /* MANTID_ICAT_CATALOGMANAGERIMPL_H_ */
......@@ -51,7 +51,7 @@ private:
using CatalogSession_sptr = boost::shared_ptr<CatalogSession>;
using CatalogSession_const_sptr = boost::shared_ptr<const CatalogSession>;
}
}
} // namespace API
} // namespace Mantid
#endif /* MANTID_API_CATALOGSESSION_H_ */
......@@ -103,7 +103,7 @@ private:
/// Current value of the variance of the pulse
double m_pulseVariance;
};
}
}
} // namespace API
} // namespace Mantid
#endif /* MANTID_API_CHOPPERMODEL_H_ */
......@@ -10,8 +10,8 @@
#include <boost/shared_ptr.hpp>
#endif
#include <cstring>
#include <string>
#include <limits>
#include <string>
#include <typeinfo>
#include <vector>
......
......@@ -4,10 +4,10 @@
//----------------------------------------------------------------------
// Includes
//----------------------------------------------------------------------
#include <vector>
#include "MantidAPI/DllConfig.h"
#include "MantidKernel/DynamicFactory.h"
#include "MantidKernel/SingletonHolder.h"
#include <vector>
namespace Mantid {
......@@ -73,6 +73,6 @@ namespace Kernel {
EXTERN_MANTID_API template class MANTID_API_DLL
Mantid::Kernel::SingletonHolder<Mantid::API::ColumnFactoryImpl>;
}
}
} // namespace Mantid
#endif /*MANTID_API_COLUMNFACTORY_H_*/
......@@ -73,6 +73,6 @@ public:
private:
std::list<ICatalog_sptr> m_catalogs;
};
}
}
} // namespace API
} // namespace Mantid
#endif /* MANTID_ICAT_COMPOSITECATALOG_H_ */
......@@ -293,7 +293,7 @@ public:
return m_J->get(m_iY0 + iY, m_iP0 + iP);
}
/** Zero all matrix elements.
*/
*/
void zero() override {
throw Kernel::Exception::NotImplementedError(
"zero() is not implemented for PartialJacobian");
......
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