Merge #11151: Fix header guards using reserved identifiers
bc70ab5
Fix header guards using reserved identifiers (Dan Raviv)
Pull request description:
Identifiers beginning with an underscore followed immediately by an uppercase letter are reserved.
Tree-SHA512: 32b45e0aef6f6325bc3cbdea399532437490b753621149374df27e1c1eed6739ad1a09ae368e888cab8d01fb757f1b190c45a0854d2861de39a9296f17e29d9e
This commit is contained in:
commit
7fd49d01dc
2 changed files with 6 additions and 6 deletions
|
@ -2,8 +2,8 @@
|
|||
// Distributed under the MIT software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
#ifndef _BITCOIN_CUCKOOCACHE_H_
|
||||
#define _BITCOIN_CUCKOOCACHE_H_
|
||||
#ifndef BITCOIN_CUCKOOCACHE_H
|
||||
#define BITCOIN_CUCKOOCACHE_H
|
||||
|
||||
#include <array>
|
||||
#include <algorithm>
|
||||
|
@ -478,4 +478,4 @@ public:
|
|||
};
|
||||
} // namespace CuckooCache
|
||||
|
||||
#endif
|
||||
#endif // BITCOIN_CUCKOOCACHE_H
|
||||
|
|
|
@ -2,8 +2,8 @@
|
|||
// Distributed under the MIT software license, see the accompanying
|
||||
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
||||
|
||||
#ifndef _BITCOIN_PREVECTOR_H_
|
||||
#define _BITCOIN_PREVECTOR_H_
|
||||
#ifndef BITCOIN_PREVECTOR_H
|
||||
#define BITCOIN_PREVECTOR_H
|
||||
|
||||
#include <assert.h>
|
||||
#include <stdlib.h>
|
||||
|
@ -514,4 +514,4 @@ public:
|
|||
};
|
||||
#pragma pack(pop)
|
||||
|
||||
#endif
|
||||
#endif // BITCOIN_PREVECTOR_H
|
||||
|
|
Loading…
Reference in a new issue