diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-08-26 12:59:13 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2017-08-26 12:59:22 +0200 |
| commit | 7fd49d01dc2ea444ba4d81d0cfa17486b03c8515 (patch) | |
| tree | fc2a3bbb4b6ef0eba3819f27c214faa730894a5e | |
| parent | 07c92b98e2a0a29d19b5ccdbbfa9addc1e80b306 (diff) | |
| parent | bc70ab5dffce5cc9894929cac7c107dcb9c25053 (diff) | |
| download | bitcoin-7fd49d01dc2ea444ba4d81d0cfa17486b03c8515.tar.xz | |
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
| -rw-r--r-- | src/cuckoocache.h | 6 | ||||
| -rw-r--r-- | src/prevector.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/cuckoocache.h b/src/cuckoocache.h index 9246a3924e..947e1a7185 100644 --- a/src/cuckoocache.h +++ b/src/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_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 diff --git a/src/prevector.h b/src/prevector.h index f7bde8911a..eb29b3ae7e 100644 --- a/src/prevector.h +++ b/src/prevector.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 |