Unverified Commit ea9080a6 authored by Nick Draper's avatar Nick Draper Committed by GitHub
Browse files

Merge pull request #28261 from mantidproject/28200_replace_ICat_header_guards

Replace header guards in ICat with pragma once
parents 76181761 1ec4d02a
......@@ -4,8 +4,7 @@
// NScD Oak Ridge National Laboratory, European Spallation Source
// & Institut Laue - Langevin
// SPDX - License - Identifier: GPL - 3.0 +
#ifndef MANTID_ICAT_CATALOGALGORITHMHELPER_H_
#define MANTID_ICAT_CATALOGALGORITHMHELPER_H_
#pragma once
#include "MantidAPI/CatalogFactory.h"
#include "MantidAPI/ICatalog.h"
......@@ -22,5 +21,3 @@ public:
};
} // namespace ICat
} // namespace Mantid
#endif
......@@ -4,8 +4,7 @@
// NScD Oak Ridge National Laboratory, European Spallation Source
// & Institut Laue - Langevin
// SPDX - License - Identifier: GPL - 3.0 +
#ifndef MANTID_ICAT_CATALOGDOWNLOADDATAFILES_H_
#define MANTID_ICAT_CATALOGDOWNLOADDATAFILES_H_
#pragma once
//----------------------------------------------------------------------
// Includes
......@@ -83,5 +82,4 @@ private:
double m_prog;
};
} // namespace ICat
} // namespace Mantid
#endif
} // 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_ICAT_CATALOGGETDATAFILES_H_
#define MANTID_ICAT_CATALOGGETDATAFILES_H_
#pragma once
#include "MantidAPI/Algorithm.h"
#include "MantidAPI/ITableWorkspace_fwd.h"
......@@ -58,5 +57,4 @@ private:
void exec() override;
};
} // namespace ICat
} // namespace Mantid
#endif
} // 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_ICAT_CATALOGGETDATASETS_H_
#define MANTID_ICAT_CATALOGGETDATASETS_H_
#pragma once
#include "MantidAPI/Algorithm.h"
#include "MantidAPI/ITableWorkspace_fwd.h"
......@@ -58,5 +57,4 @@ private:
void exec() override;
};
} // namespace ICat
} // namespace Mantid
#endif
} // 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_ICAT_CATALOGKEEPALIVE_H_
#define MANTID_ICAT_CATALOGKEEPALIVE_H_
#pragma once
#include "MantidAPI/Algorithm.h"
#include "MantidICat/DllConfig.h"
......@@ -54,5 +53,4 @@ private:
void exec() override;
};
} // namespace ICat
} // namespace Mantid
#endif
} // 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_ICAT_CATALOGLISTINSTRUMENTS_H_
#define MANTID_ICAT_CATALOGLISTINSTRUMENTS_H_
#pragma once
#include "MantidAPI/Algorithm.h"
#include "MantidAPI/ITableWorkspace_fwd.h"
......@@ -49,5 +48,4 @@ private:
void exec() override;
};
} // namespace ICat
} // namespace Mantid
#endif
} // 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_ICAT_CATALOGLISTINVESTIGATIONTYPES_H_
#define MANTID_ICAT_CATALOGLISTINVESTIGATIONTYPES_H_
#pragma once
#include "MantidAPI/Algorithm.h"
#include "MantidDataObjects/TableWorkspace.h"
......@@ -51,5 +50,4 @@ private:
void exec() override;
};
} // namespace ICat
} // namespace Mantid
#endif
} // 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_ICAT_CATALOGLOGIN_H_
#define MANTID_ICAT_CATALOGLOGIN_H_
#pragma once
#include "MantidAPI/Algorithm.h"
#include "MantidICat/DllConfig.h"
......@@ -55,5 +54,4 @@ private:
void exec() override;
};
} // namespace ICat
} // namespace Mantid
#endif
} // 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_ICAT_CATALOGLOGOUT_H_
#define MANTID_ICAT_CATALOGLOGOUT_H_
#pragma once
#include "MantidAPI/Algorithm.h"
#include "MantidICat/DllConfig.h"
......@@ -51,5 +50,3 @@ private:
};
} // namespace ICat
} // namespace Mantid
#endif
......@@ -4,8 +4,7 @@
// NScD Oak Ridge National Laboratory, European Spallation Source
// & Institut Laue - Langevin
// SPDX - License - Identifier: GPL - 3.0 +
#ifndef MANTID_ICAT_CATALOGMYDATASEARCH_H_
#define MANTID_ICAT_CATALOGMYDATASEARCH_H_
#pragma once
#include "MantidAPI/Algorithm.h"
#include "MantidAPI/ITableWorkspace_fwd.h"
......@@ -59,5 +58,3 @@ private:
};
} // namespace ICat
} // namespace Mantid
#endif
......@@ -4,8 +4,7 @@
// NScD Oak Ridge National Laboratory, European Spallation Source
// & Institut Laue - Langevin
// SPDX - License - Identifier: GPL - 3.0 +
#ifndef MANTID_ICAT_CATALOGPUBLISH_H
#define MANTID_ICAT_CATALOGPUBLISH_H
#pragma once
#include "MantidAPI/Algorithm.h"
#include "MantidAPI/ICatalogInfoService.h"
......@@ -75,5 +74,4 @@ private:
generateWorkspaceHistory(Mantid::API::Workspace_sptr &workspace);
};
} // namespace ICat
} // namespace Mantid
#endif
} // 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_ICAT_CATALOGSEARCH_H_
#define MANTID_ICAT_CATALOGSEARCH_H_
#pragma once
#include "MantidAPI/Algorithm.h"
#include "MantidAPI/ITableWorkspace_fwd.h"
......@@ -76,5 +75,3 @@ private:
};
} // namespace ICat
} // namespace Mantid
#endif
......@@ -4,8 +4,7 @@
// NScD Oak Ridge National Laboratory, European Spallation Source
// & Institut Laue - Langevin
// SPDX - License - Identifier: GPL - 3.0 +
#ifndef MANTID_ICAT_CATALOGSEARCHPARAM_H_
#define MANTID_ICAT_CATALOGSEARCHPARAM_H_
#pragma once
#include <stdexcept>
#include <string>
......@@ -108,5 +107,4 @@ private:
std::string m_investigationId;
};
} // namespace ICat
} // namespace Mantid
#endif
} // namespace Mantid
\ No newline at end of file
......@@ -14,8 +14,7 @@ This program is released under the GPL with the additional exemption that
compiling, linking, and/or using OpenSSL is allowed.
*/
#ifndef soapserializersH_H
#define soapserializersH_H
#pragma once
#include "soapserializersStub.h"
#ifndef WITH_NOIDREF
......@@ -704,7 +703,3 @@ SOAP_FMAC3 char **SOAP_FMAC4 soap_get_string(struct soap *, char **,
soap_end_recv(soap), \
soap->error)
#endif
#endif
/* End of soapserializersH.h */
......@@ -14,8 +14,7 @@ This program is released under the GPL with the additional exemption that
compiling, linking, and/or using OpenSSL is allowed.
*/
#ifndef soapserializersStub_H
#define soapserializersStub_H
#pragma once
#include "stdsoap2.h"
#if GSOAP_VERSION != 20815
#error "GSOAP VERSION MISMATCH IN GENERATED CODE: PLEASE REINSTALL PACKAGE"
......@@ -165,7 +164,3 @@ using _XML = char *;
* Externals *
* *
\******************************************************************************/
#endif
/* End of soapserializersStub.h */
......@@ -8,8 +8,7 @@ This program is released under the GPL with the additional exemption that
compiling, linking, and/or using OpenSSL is allowed.
*/
 
#ifndef ICat3H_H
#define ICat3H_H
#pragma once
#include "ICat3Stub.h"
 
namespace ICat3 {
......@@ -58732,7 +58731,3 @@ SOAP_FMAC3 void SOAP_FMAC4 soap_copy_std__vectorTemplateOfPointerToxsd__anyType(
struct soap *, int, int, void *, size_t, const void *, size_t);
 
} // namespace ICat3
#endif
/* End of ICat3H.h */
......@@ -8,8 +8,7 @@ This program is released under the GPL with the additional exemption that
compiling, linking, and/or using OpenSSL is allowed.
*/
#ifndef ICat3ICATPortBindingProxy_H
#define ICat3ICATPortBindingProxy_H
#pragma once
#include "MantidICat/ICat3/GSoapGenerated/ICat3H.h"
namespace ICat3 {
......@@ -2062,5 +2061,3 @@ public:
};
} // namespace ICat3
#endif
......@@ -8,8 +8,7 @@ This program is released under the GPL with the additional exemption that
compiling, linking, and/or using OpenSSL is allowed.
*/
#ifndef ICat3Stub_H
#define ICat3Stub_H
#pragma once
// -Wsuggest-override generates 2422 warnings in this file and
// clang-tidy 3.8 segfaults when trying to fix them. At this point,
......@@ -11963,7 +11962,3 @@ using _XML = char *;
#pragma GCC diagnostic pop
#undef GCC_VERSION
#endif
#endif
/* End of ICat3Stub.h */
......@@ -4,8 +4,7 @@
// NScD Oak Ridge National Laboratory, European Spallation Source
// & Institut Laue - Langevin
// SPDX - License - Identifier: GPL - 3.0 +
#ifndef MANTID_ICAT_ICAT3CATALOG_H_
#define MANTID_ICAT_ICAT3CATALOG_H_
#pragma once
#include "MantidAPI/ICatalog.h"
#include "MantidAPI/ICatalogInfoService.h"
......@@ -75,5 +74,3 @@ private:
};
} // namespace ICat
} // namespace Mantid
#endif
......@@ -4,8 +4,7 @@
// NScD Oak Ridge National Laboratory, European Spallation Source
// & Institut Laue - Langevin
// SPDX - License - Identifier: GPL - 3.0 +
#ifndef MANTID_ICAT_ERRORHANDLING_H_
#define MANTID_ICAT_ERRORHANDLING_H_
#pragma once
//----------------------------------------------------------------------
// Includes
......@@ -53,5 +52,4 @@ public:
const char *what() const noexcept override;
};
} // namespace ICat
} // namespace Mantid
#endif
} // namespace Mantid
\ No newline at end of file
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