Commit f044de9c authored by Martyn Gigg's avatar Martyn Gigg
Browse files

Reformat codebase with clang-format 6.0

parent 1e924cdb
......@@ -23,8 +23,8 @@
#include "MantidKernel/ArrayProperty.h"
#include "MantidKernel/UnitFactory.h"
using Mantid::DataHandling::GroupDetectors;
using Mantid::MantidVecPtr;
using Mantid::DataHandling::GroupDetectors;
using namespace Mantid::Kernel;
using namespace Mantid::API;
using namespace Mantid::Geometry;
......
......@@ -33,8 +33,8 @@ using namespace Mantid::API;
using namespace Mantid::Geometry;
using namespace Mantid::DataObjects;
using Mantid::HistogramData::BinEdges;
using Mantid::HistogramData::CountStandardDeviations;
using Mantid::HistogramData::Counts;
using Mantid::HistogramData::CountStandardDeviations;
using Mantid::HistogramData::LinearGenerator;
/* choose an instrument to test, we could test all instruments
......
......@@ -29,8 +29,8 @@ using namespace Mantid::API;
using namespace Mantid::Kernel;
using namespace Mantid::DataHandling;
using namespace Mantid::DataObjects;
using Mantid::Types::Core::DateAndTime;
using Mantid::detid_t;
using Mantid::Types::Core::DateAndTime;
class LoadMuonNexus2Test : public CxxTest::TestSuite {
public:
......
......@@ -31,14 +31,14 @@ using namespace Mantid::Kernel;
using namespace Mantid::API;
using namespace Mantid::DataObjects;
using namespace Mantid::Geometry;
using Mantid::detid_t;
using Mantid::MantidVecPtr;
using Mantid::specnum_t;
using Mantid::HistogramData::BinEdges;
using Mantid::HistogramData::CountStandardDeviations;
using Mantid::HistogramData::Counts;
using Mantid::HistogramData::CountStandardDeviations;
using Mantid::HistogramData::LinearGenerator;
using Mantid::MantidVecPtr;
using Mantid::Types::Event::TofEvent;
using Mantid::detid_t;
using Mantid::specnum_t;
class MaskDetectorsTest : public CxxTest::TestSuite {
public:
......
......@@ -121,6 +121,7 @@ public:
void power(double exponent);
// --------------------------------------------------------------------------------------------
MDHistoWorkspace &operator&=(const MDHistoWorkspace &b);
MDHistoWorkspace &operator|=(const MDHistoWorkspace &b);
MDHistoWorkspace &operator^=(const MDHistoWorkspace &b);
......
......@@ -130,11 +130,11 @@ public:
constexpr wide_integer<Bits, Signed> &
operator++() noexcept(is_same<Signed, unsigned>::value);
constexpr wide_integer<Bits, Signed>
operator++(int)noexcept(is_same<Signed, unsigned>::value);
operator++(int) noexcept(is_same<Signed, unsigned>::value);
constexpr wide_integer<Bits, Signed> &
operator--() noexcept(is_same<Signed, unsigned>::value);
constexpr wide_integer<Bits, Signed>
operator--(int)noexcept(is_same<Signed, unsigned>::value);
operator--(int) noexcept(is_same<Signed, unsigned>::value);
// observers
......
......@@ -5,6 +5,7 @@
#include <array>
#include <cstring>
/// @cond DOXYGEN_BUG
namespace std {
#define CT(x) \
std::common_type_t<std::decay_t<decltype(rhs)>, \
......@@ -1093,7 +1094,7 @@ operator++() noexcept(is_same<Signed, unsigned>::value) {
template <size_t Bits, typename Signed>
constexpr wide_integer<Bits, Signed> wide_integer<Bits, Signed>::
operator++(int)noexcept(is_same<Signed, unsigned>::value) {
operator++(int) noexcept(is_same<Signed, unsigned>::value) {
auto tmp = *this;
*this = _impl::operator_plus(*this, 1);
return tmp;
......@@ -1108,7 +1109,7 @@ operator--() noexcept(is_same<Signed, unsigned>::value) {
template <size_t Bits, typename Signed>
constexpr wide_integer<Bits, Signed> wide_integer<Bits, Signed>::
operator--(int)noexcept(is_same<Signed, unsigned>::value) {
operator--(int) noexcept(is_same<Signed, unsigned>::value) {
auto tmp = *this;
*this = _impl::operator_minus(*this, 1);
return tmp;
......@@ -1619,3 +1620,4 @@ struct hash<wide_integer<Bits, Signed>> {
#undef CT
} // namespace std
/// @endcond DOXYGEN_BUG
......@@ -1058,6 +1058,7 @@ void MDHistoWorkspace::power(double exponent) {
//==============================================================================================
//----------------------------------------------------------------------------------------------
/// @cond DOXYGEN_BUG
/** A boolean &= (and) operation, element-by-element, for two
*MDHistoWorkspace's.
*
......@@ -1076,6 +1077,7 @@ MDHistoWorkspace &MDHistoWorkspace::operator&=(const MDHistoWorkspace &b) {
}
return *this;
}
/// @endcond DOXYGEN_BUG
//----------------------------------------------------------------------------------------------
/** A boolean |= (or) operation, element-by-element, for two MDHistoWorkspace's.
......
......@@ -75,10 +75,10 @@ public:
}
void test_CreateOrOpenFile() {
using Mantid::coord_t;
using Mantid::API::FileFinder;
using Mantid::DataObjects::BoxControllerNeXusIO;
using Mantid::Kernel::Exception::FileError;
using Mantid::coord_t;
BoxControllerNeXusIO *pSaver(nullptr);
TS_ASSERT_THROWS_NOTHING(pSaver = createTestBoxController());
......
......@@ -27,7 +27,6 @@ using namespace Mantid;
using namespace Mantid::Kernel;
using Mantid::Geometry::MDBoxImplicitFunction;
using Mantid::Geometry::MDImplicitFunction;
using Mantid::Geometry::MDImplicitFunction;
using Mantid::Geometry::MDPlane;
class MDBoxIteratorTest : public CxxTest::TestSuite {
......
......@@ -30,7 +30,6 @@ using Mantid::Geometry::MDHistoDimension;
using Mantid::Geometry::MDHistoDimension_sptr;
using Mantid::Geometry::MDImplicitFunction;
using Mantid::Geometry::MDPlane;
using Mantid::Geometry::MDPlane;
using Mantid::Kernel::VMD;
class MDHistoWorkspaceIteratorTest : public CxxTest::TestSuite {
......
......@@ -16,8 +16,8 @@ class PropertyManagerHelper : public Mantid::Kernel::PropertyManager {
public:
PropertyManagerHelper() : PropertyManager() {}
using IPropertyManager::TypedValue;
using IPropertyManager::getValue;
using IPropertyManager::TypedValue;
using PropertyManager::declareProperty;
using PropertyManager::setProperty;
};
......
......@@ -26,8 +26,8 @@ using namespace Mantid::Geometry;
using namespace Mantid::HistogramData;
using namespace Mantid::Kernel;
using namespace Mantid::API;
using HistogramData::CountStandardDeviations;
using HistogramData::Counts;
using HistogramData::CountStandardDeviations;
using HistogramData::LinearGenerator;
using WorkspaceCreationHelper::create2DWorkspaceBinned;
......
......@@ -104,7 +104,7 @@ private:
#pragma pack(pop) // Return to default packing size
} // namespace API
} // namespace Geometry
} // namespace Mantid
......
......@@ -43,8 +43,8 @@
using namespace Mantid;
using namespace Mantid::Kernel;
using namespace Mantid::Types::Core;
using Poco::XML::DOMParser;
using Poco::XML::Document;
using Poco::XML::DOMParser;
using Poco::XML::Element;
using Poco::XML::Node;
using Poco::XML::NodeFilter;
......
......@@ -33,9 +33,9 @@
#include "boost/make_shared.hpp"
using Poco::XML::Document;
using Poco::XML::DOMParser;
using Poco::XML::DOMWriter;
using Poco::XML::Document;
using Poco::XML::Element;
using Poco::XML::Node;
using Poco::XML::NodeList;
......
......@@ -24,8 +24,8 @@
#include <sstream>
using Poco::XML::AutoPtr;
using Poco::XML::DOMWriter;
using Poco::XML::Document;
using Poco::XML::DOMWriter;
using Poco::XML::Element;
using Poco::XML::Text;
using Poco::XML::XMLWriter;
......
......@@ -22,9 +22,9 @@
using namespace Mantid::Geometry;
using namespace Mantid::Kernel;
using ::testing::_;
using ::testing::Mock;
using ::testing::Return;
using ::testing::_;
class BasicHKLFiltersTest : public CxxTest::TestSuite {
public:
......
......@@ -33,8 +33,8 @@
using namespace Mantid;
using namespace Geometry;
using Mantid::Kernel::V3D;
using detail::ShapeInfo;
using Mantid::Kernel::V3D;
class CSGObjectTest : public CxxTest::TestSuite {
......
......@@ -20,9 +20,9 @@
using namespace Mantid::Geometry;
using namespace Mantid::Kernel;
using ::testing::_;
using ::testing::Mock;
using ::testing::Return;
using ::testing::_;
class HKLFilterTest : public CxxTest::TestSuite {
public:
......
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