Improve #include guard macros

Avoid using reserved identifiers such as `_DOHINT_H` (fixes #1989),
fix cases where the name doesn't match the filename, and make the naming
more consistent and less likely to collide with include guards in other
headers.
This commit is contained in:
Olly Betts 2022-07-19 08:14:07 +12:00 committed by Olly Betts
commit 892557e799
21 changed files with 51 additions and 51 deletions

View file

@ -1,5 +1,5 @@
#ifndef _example_guardian_
#define _example_guardian_
#ifndef EXAMPLE_H
#define EXAMPLE_H
int module_function() { return 7; }
int module_variable = 9;

View file

@ -1,5 +1,5 @@
#ifndef _example_guardian_
#define _example_guardian_
#ifndef EXAMPLE_H
#define EXAMPLE_H
int module_function() { return 7; }
int module_variable = 9;

View file

@ -1,5 +1,5 @@
#ifndef _EXAMPLE_H_
#define _EXAMPLE_H_
#ifndef EXAMPLE_H
#define EXAMPLE_H
#include <vector>
#include <string>
@ -46,4 +46,4 @@ public:
Animal* get_animal(size_t i) const;
};
#endif /*_EXAMPLE_H_*/
#endif /* EXAMPLE_H */

View file

@ -1,5 +1,5 @@
#ifndef _EXAMPLE_H_
#define _EXAMPLE_H_
#ifndef EXAMPLE_H
#define EXAMPLE_H
#include <vector>
#include <string>
@ -46,4 +46,4 @@ public:
Animal* get_animal(size_t i) const;
};
#endif /*_EXAMPLE_H_*/
#endif /* EXAMPLE_H */

View file

@ -1,5 +1,5 @@
#ifndef TEST_SUITE_REFCOUNT_H__
#define TEST_SUITE_REFCOUNT_H__
#ifndef TEST_SUITE_REFCOUNT_H
#define TEST_SUITE_REFCOUNT_H
struct RCObjBase {
/*!
@ -195,4 +195,4 @@ RCPtr<T>& RCPtr<T>::operator=(const RCPtr& rhs)
#endif //TEST_SUITE_REFCOUNT_H__
#endif // TEST_SUITE_REFCOUNT_H

View file

@ -1,5 +1,5 @@
#ifndef ___typedef_import_h__
#define ___typedef_import_h__
#ifndef TEMPLATE_TYPEDEF_CPLX2_H
#define TEMPLATE_TYPEDEF_CPLX2_H
#ifdef SWIG
%module template_typedef_cplx2;
@ -174,4 +174,4 @@ namespace vfncs {
#endif
#endif //___template_typedef_h__
#endif // TEMPLATE_TYPEDEF_CPLX2_H