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

Merge pull request #28240 from mantidproject/28200_replaceCatalog_header_guards_with_pragma_once

Remove all header guards in Catalog and replace with pragma once
parents c5fbd6be 8ad4e740
......@@ -4,8 +4,7 @@
// NScD Oak Ridge National Laboratory, European Spallation Source
// & Institut Laue - Langevin
// SPDX - License - Identifier: GPL - 3.0 +
#ifndef MANTID_CATALOG_EXCEPTION_H_
#define MANTID_CATALOG_EXCEPTION_H_
#pragma once
#include <stdexcept>
......@@ -57,5 +56,3 @@ public:
} // namespace Exception
} // namespace Catalog
} // namespace Mantid
#endif // MANTID_CATALOG_EXCEPTION_H_
......@@ -4,8 +4,7 @@
// NScD Oak Ridge National Laboratory, European Spallation Source
// & Institut Laue - Langevin
// SPDX - License - Identifier: GPL - 3.0 +
#ifndef MANTID_CATALOG_OAUTH_H_
#define MANTID_CATALOG_OAUTH_H_
#pragma once
#include "MantidCatalog/DllConfig.h"
#include "MantidKernel/DateAndTime.h"
......@@ -86,5 +85,3 @@ using ConfigServiceTokenStore_uptr = std::unique_ptr<ConfigServiceTokenStore>;
} // namespace OAuth
} // namespace Catalog
} // namespace Mantid
#endif /* MANTID_CATALOG_OAUTH_H_ */
......@@ -4,8 +4,7 @@
// NScD Oak Ridge National Laboratory, European Spallation Source
// & Institut Laue - Langevin
// SPDX - License - Identifier: GPL - 3.0 +
#ifndef MANTID_CATALOG_ONCAT_H_
#define MANTID_CATALOG_ONCAT_H_
#pragma once
#include "MantidCatalog/DllConfig.h"
#include "MantidCatalog/OAuth.h"
......@@ -149,5 +148,3 @@ private:
} // namespace ONCat
} // namespace Catalog
} // namespace Mantid
#endif /* MANTID_CATALOG_ONCAT_H_ */
......@@ -4,8 +4,7 @@
// NScD Oak Ridge National Laboratory, European Spallation Source
// & Institut Laue - Langevin
// SPDX - License - Identifier: GPL - 3.0 +
#ifndef MANTID_CATALOG_ONCATENTITY_H_
#define MANTID_CATALOG_ONCATENTITY_H_
#pragma once
#include "MantidCatalog/DllConfig.h"
#include "MantidCatalog/Exception.h"
......@@ -130,5 +129,3 @@ ONCatEntity::getNestedContentValueAsType(const Content &content,
} // namespace ONCat
} // namespace Catalog
} // namespace Mantid
#endif /* MANTID_CATALOG_ONCATENTITY_H_ */
......@@ -4,8 +4,7 @@
// NScD Oak Ridge National Laboratory, European Spallation Source
// & Institut Laue - Langevin
// SPDX - License - Identifier: GPL - 3.0 +
#ifndef MANTID_CATALOG_OAUTHTEST_H_
#define MANTID_CATALOG_OAUTHTEST_H_
#pragma once
#include <cxxtest/TestSuite.h>
......@@ -45,5 +44,3 @@ public:
TS_ASSERT(oauthToken.isExpired(DateAndTime::getCurrentTime() + 3601.0));
}
};
#endif /* MANTID_CATALOG_OAUTHTEST_H_ */
......@@ -4,8 +4,7 @@
// NScD Oak Ridge National Laboratory, European Spallation Source
// & Institut Laue - Langevin
// SPDX - License - Identifier: GPL - 3.0 +
#ifndef MANTID_CATALOG_ONCATENTITYTEST_H_
#define MANTID_CATALOG_ONCATENTITYTEST_H_
#pragma once
#include <cxxtest/TestSuite.h>
......@@ -149,5 +148,3 @@ public:
TS_ASSERT_EQUALS(dummy.get<bool>("a.bool", true), true);
}
};
#endif /* MANTID_CATALOG_ONCATENTITYTEST_H_ */
......@@ -4,8 +4,7 @@
// NScD Oak Ridge National Laboratory, European Spallation Source
// & Institut Laue - Langevin
// SPDX - License - Identifier: GPL - 3.0 +
#ifndef MANTID_CATALOG_ONCATTEST_H_
#define MANTID_CATALOG_ONCATTEST_H_
#pragma once
#include <cxxtest/TestSuite.h>
......@@ -352,5 +351,3 @@ public:
TS_ASSERT_EQUALS(*testToken->refreshToken(), *result->refreshToken());
}
};
#endif /* MANTID_CATALOG_ONCATTEST_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