Commit c41c8eb1 authored by Harriet Brown's avatar Harriet Brown
Browse files

Replace header guards in Nexus and NexusGeometry with pragma once

This commit replaces all header guards in Nexus and NexusGeometry with #pragma once
parent 16a65d2f
......@@ -4,8 +4,7 @@
// NScD Oak Ridge National Laboratory, European Spallation Source
// & Institut Laue - Langevin
// SPDX - License - Identifier: GPL - 3.0 +
#ifndef MUONNEXUSREADER_H
#define MUONNEXUSREADER_H
#pragma once
#include "MantidAPI/Algorithm.h"
#include "MantidDataObjects/Workspace2D.h"
......@@ -99,5 +98,3 @@ public:
int numDetectors; ///< detector count
std::string getInstrumentName() const; ///< return instrument name
};
#endif /* MUONNEXUSREADER_H */
......@@ -4,8 +4,7 @@
// NScD Oak Ridge National Laboratory, European Spallation Source
// & Institut Laue - Langevin
// SPDX - License - Identifier: GPL - 3.0 +
#ifndef MANTID_NEXUS_NEXUSCLASSES_H_
#define MANTID_NEXUS_NEXUSCLASSES_H_
#pragma once
//----------------------------------------------------------------------
// Includes
......@@ -983,5 +982,3 @@ private:
} // namespace NeXus
} // namespace Mantid
#endif /*MANTID_NEXUS_NEXUSCLASSES_H_*/
......@@ -4,8 +4,7 @@
// NScD Oak Ridge National Laboratory, European Spallation Source
// & Institut Laue - Langevin
// SPDX - License - Identifier: GPL - 3.0 +
#ifndef NEXUSFILEIO_H
#define NEXUSFILEIO_H
#pragma once
#include "MantidAPI/ITableWorkspace_fwd.h"
#include "MantidAPI/MatrixWorkspace_fwd.h"
#include "MantidAPI/Progress.h"
......@@ -417,5 +416,3 @@ using NexusFileIO_sptr = boost::shared_ptr<NexusFileIO>;
} // namespace NeXus
} // namespace Mantid
#endif /* NEXUSFILEIO_H */
......@@ -4,8 +4,7 @@
// NScD Oak Ridge National Laboratory, European Spallation Source
// & Institut Laue - Langevin
// SPDX - License - Identifier: GPL - 3.0 +
#ifndef NEXUSIOHELPER_H
#define NEXUSIOHELPER_H
#pragma once
#include "MantidIndexing/DllConfig.h"
#include <algorithm>
......@@ -192,5 +191,3 @@ T readNexusValue(::NeXus::File &file, std::string entry = "") {
} // namespace NeXusIOHelper
} // namespace NeXus
} // namespace Mantid
#endif /* NEXUSIOHELPER_H */
......@@ -4,8 +4,7 @@
// NScD Oak Ridge National Laboratory, European Spallation Source
// & Institut Laue - Langevin
// SPDX - License - Identifier: GPL - 3.0 +
#ifndef MANTID_NEXUS_PRECOMPILEDHEADER_H_
#define MANTID_NEXUS_PRECOMPILEDHEADER_H_
#pragma once
// NeXus
#include "MantidNexusCPP/NeXusFile.hpp"
......@@ -15,5 +14,3 @@
#include <map>
#include <string>
#include <vector>
#endif // MANTID_NEXUS_PRECOMPILEDHEADER_H_
\ No newline at end of file
......@@ -4,8 +4,7 @@
// NScD Oak Ridge National Laboratory, European Spallation Source
// & Institut Laue - Langevin
// SPDX - License - Identifier: GPL - 3.0 +
#ifndef NEXUSIOHELPERTEST_H_
#define NEXUSIOHELPERTEST_H_
#pragma once
#include "MantidAPI/FileFinder.h"
#include "MantidNexus/NexusIOHelper.h"
......@@ -173,5 +172,3 @@ public:
file.close();
}
};
#endif /*NEXUSIOHELPERTEST_H_*/
......@@ -4,8 +4,7 @@
// NScD Oak Ridge National Laboratory, European Spallation Source
// & Institut Laue - Langevin
// SPDX - License - Identifier: GPL - 3.0 +
#ifndef MANTID_NEXUSGEOMETRY_ABSTRACTLOGGER_H_
#define MANTID_NEXUSGEOMETRY_ABSTRACTLOGGER_H_
#pragma once
#include "MantidNexusGeometry/DllConfig.h"
#include <memory>
......@@ -63,5 +62,3 @@ template <typename T> std::unique_ptr<AbstractLogger> makeLogger(T *adaptee) {
} // namespace NexusGeometry
} // namespace Mantid
#endif /* MANTID_NEXUSGEOMETRY_ABSTRACTLOGGER_H_ */
......@@ -4,8 +4,7 @@
// NScD Oak Ridge National Laboratory, European Spallation Source
// & Institut Laue - Langevin
// SPDX - License - Identifier: GPL - 3.0 +
#ifndef MANTIDNEXUSGEOMETRY_H5FORWARDCOMPATIBILITY
#define MANTIDNEXUSGEOMETRY_H5FORWARDCOMPATIBILITY
#pragma once
#include "MantidNexusGeometry/DllConfig.h"
#include <H5Cpp.h>
......@@ -31,5 +30,3 @@ std::string getObjName(const H5::H5File &obj);
} // namespace H5ForwardCompatibility
} // namespace NexusGeometry
} // namespace Mantid
#endif // MANTIDNEXUSGEOMETRY_H5FORWARDCOMPATIBILITY
......@@ -4,8 +4,7 @@
// NScD Oak Ridge National Laboratory, European Spallation Source
// & Institut Laue - Langevin
// SPDX - License - Identifier: GPL - 3.0 +
#ifndef MANTIDHDF5_VERSION_H_
#define MANTIDHDF5_VERSION_H_
#pragma once
#include "MantidNexusGeometry/DllConfig.h"
......@@ -24,5 +23,3 @@ MANTID_NEXUSGEOMETRY_DLL bool checkVariableLengthStringSupport();
} // namespace Hdf5Version
} // namespace NexusGeometry
} // namespace Mantid
#endif // MANTIDHDF5_VERSION_H_
......@@ -4,8 +4,7 @@
// NScD Oak Ridge National Laboratory, European Spallation Source
// & Institut Laue - Langevin
// SPDX - License - Identifier: GPL - 3.0 +
#ifndef MANTIDNEXUSGEOMETRY_INSTRUMENTBUILDER_H
#define MANTIDNEXUSGEOMETRY_INSTRUMENTBUILDER_H
#pragma once
#include "MantidGeometry/IDTypes.h"
#include "MantidGeometry/Objects/IObject.h"
......@@ -80,5 +79,4 @@ private:
Geometry::ICompAssembly *m_lastBank = nullptr;
};
} // namespace NexusGeometry
} // namespace Mantid
#endif // MANTIDNEXUSGEOMETRY_INSTRUMENTBUILDER_H
} // namespace Mantid
\ No newline at end of file
......@@ -4,8 +4,7 @@
// NScD Oak Ridge National Laboratory, European Spallation Source
// & Institut Laue - Langevin
// SPDX - License - Identifier: GPL - 3.0 +
#ifndef MANTID_NEXUSGEOMETRY_JSONGEOMETRYPARSER_H_
#define MANTID_NEXUSGEOMETRY_JSONGEOMETRYPARSER_H_
#pragma once
#include "MantidGeometry/IDTypes.h"
#include "MantidNexusGeometry/DllConfig.h"
......@@ -188,5 +187,3 @@ private:
} // namespace NexusGeometry
} // namespace Mantid
#endif /* MANTID_NEXUSGEOMETRY_JSONGEOMETRYPARSER_H_ */
......@@ -4,8 +4,7 @@
// NScD Oak Ridge National Laboratory, European Spallation Source
// & Institut Laue - Langevin
// SPDX - License - Identifier: GPL - 3.0 +
#ifndef MANTID_NEXUSGEOMETRY_JSONINSTRUMENTBUILDER_H_
#define MANTID_NEXUSGEOMETRY_JSONINSTRUMENTBUILDER_H_
#pragma once
#include "MantidGeometry/Instrument_fwd.h"
#include "MantidNexusGeometry/DllConfig.h"
......@@ -36,5 +35,3 @@ private:
} // namespace NexusGeometry
} // namespace Mantid
#endif /* MANTID_NEXUSGEOMETRY_JSONINSTRUMENTBUILDER_H_ */
......@@ -4,8 +4,7 @@
// NScD Oak Ridge National Laboratory, European Spallation Source
// & Institut Laue - Langevin
// SPDX - License - Identifier: GPL - 3.0 +
#ifndef MANTIDNEXUSGEOMETRY_NEXUSGEOMETRYDEFINITIONS_H
#define MANTIDNEXUSGEOMETRY_NEXUSGEOMETRYDEFINITIONS_H
#pragma once
#include <H5Cpp.h>
#include <string>
......@@ -82,5 +81,3 @@ const std::string NEXUS_STRUCTURE = "nexus_structure";
} // namespace NexusGeometry
} // namespace Mantid
#endif // MANTIDNEXUSGEOMETRY_NEXUSGEOMETRYDEFINITIONS_H
......@@ -4,8 +4,7 @@
// NScD Oak Ridge National Laboratory, European Spallation Source
// & Institut Laue - Langevin
// SPDX - License - Identifier: GPL - 3.0 +
#ifndef MANTIDNEXUSGEOMETRY_PARSER_H_
#define MANTIDNEXUSGEOMETRY_PARSER_H_
#pragma once
#include "MantidNexusGeometry/AbstractLogger.h"
#include "MantidNexusGeometry/DllConfig.h"
......@@ -30,5 +29,3 @@ getMangledName(const std::string &fileName, const std::string &instName);
} // namespace NexusGeometryParser
} // namespace NexusGeometry
} // namespace Mantid
#endif // MANTIDNEXUSGEOMETRY_PARSER_H_
......@@ -14,8 +14,7 @@
* @date 07/08/2019
*/
#ifndef MANTID_NEXUSGEOMETRY_NEXUSGEOMETRYSAVE_H_
#define MANTID_NEXUSGEOMETRY_NEXUSGEOMETRYSAVE_H_
#pragma once
#include "MantidAPI/MatrixWorkspace.h"
#include "MantidNexusGeometry/AbstractLogger.h"
......@@ -67,5 +66,3 @@ MANTID_NEXUSGEOMETRY_DLL void saveInstrument(
} // namespace NexusGeometrySave
} // namespace NexusGeometry
} // namespace Mantid
#endif /* MANTID_NEXUSGEOMETRY_NEXUSGEOMETRYSAVE_H_ */
......@@ -4,8 +4,7 @@
// NScD Oak Ridge National Laboratory, European Spallation Source
// & Institut Laue - Langevin
// SPDX - License - Identifier: GPL - 3.0 +
#ifndef MANTID_NEXUSGEOMETRY_NEXUSGEOMETRYUTILITIES_H_
#define MANTID_NEXUSGEOMETRY_NEXUSGEOMETRYUTILITIES_H_
#pragma once
#include "MantidNexusGeometry/DllConfig.h"
#include <H5Cpp.h>
......@@ -45,5 +44,3 @@ bool isNamed(const H5::H5Object &obj, const std::string &name);
} // namespace utilities
} // namespace NexusGeometry
} // namespace Mantid
#endif /* MANTID_NEXUSGEOMETRY_NEXUSGEOMETRYUTILITIES_H_ */
......@@ -4,8 +4,7 @@
// NScD Oak Ridge National Laboratory, European Spallation Source
// & Institut Laue - Langevin
// SPDX - License - Identifier: GPL - 3.0 +
#ifndef MANTIDNEXUSGEOMETRY_SHAPEFACTORY_H
#define MANTIDNEXUSGEOMETRY_SHAPEFACTORY_H
#pragma once
#include "MantidNexusGeometry/DllConfig.h"
......@@ -55,5 +54,4 @@ createFromOFFMesh(const std::vector<uint32_t> &faceIndices,
const std::vector<Eigen::Vector3d> &nexusVertices);
} // namespace NexusShapeFactory
} // namespace NexusGeometry
} // namespace Mantid
#endif // MANTIDNEXUSGEOMETRY_SHAPEFACTORY_H
} // namespace Mantid
\ No newline at end of file
......@@ -4,8 +4,7 @@
// NScD Oak Ridge National Laboratory, European Spallation Source
// & Institut Laue - Langevin
// SPDX - License - Identifier: GPL - 3.0 +
#ifndef MANTIDNEXUSGEOMETRY_TUBEBUILDER_H
#define MANTIDNEXUSGEOMETRY_TUBEBUILDER_H
#pragma once
#include "MantidNexusGeometry/DllConfig.h"
#include <Eigen/Core>
#include <Eigen/Geometry>
......@@ -56,5 +55,3 @@ private:
} // namespace detail
} // namespace NexusGeometry
} // namespace Mantid
#endif // MANTIDNEXUSGEOMETRY_TUBEBUILDER_H
......@@ -4,8 +4,7 @@
// NScD Oak Ridge National Laboratory, European Spallation Source
// & Institut Laue - Langevin
// SPDX - License - Identifier: GPL - 3.0 +
#ifndef MANTIDNEXUSGEOMETRY_TUBEHELPERS_H
#define MANTIDNEXUSGEOMETRY_TUBEHELPERS_H
#pragma once
#include "MantidGeometry/IDTypes.h"
#include "MantidNexusGeometry/TubeBuilder.h"
......@@ -32,5 +31,4 @@ notInTubes(const std::vector<detail::TubeBuilder> &tubes,
std::vector<Mantid::detid_t> detIDs);
} // namespace TubeHelpers
} // namespace NexusGeometry
} // namespace Mantid
#endif // MANTIDNEXUSGEOMETRY_TUBEHELPER_H
} // namespace Mantid
\ No newline at end of file
......@@ -4,8 +4,7 @@
// NScD Oak Ridge National Laboratory, European Spallation Source
// & Institut Laue - Langevin
// SPDX - License - Identifier: GPL - 3.0 +
#ifndef INSTRUMENT_GEOMETRY_ABSTRACTION_TEST_H_
#define INSTRUMENT_GEOMETRY_ABSTRACTION_TEST_H_
#pragma once
#include <cxxtest/TestSuite.h>
......@@ -87,5 +86,3 @@ private:
boost::shared_ptr<const Geometry::IObject> shape =
boost::make_shared<const Geometry::CSGObject>();
};
#endif // INSTRUMENT_GEOMETRY_ABSTRACTION_TEST_H_
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