Modify header guard to contain both directory and file name of the header file script_error.h #5310

pull paveljanik wants to merge 1 commits into bitcoin:master from paveljanik:headerguards1 changing 2 files +6 −6

paveljanik commented at 10:02 AM on November 19, 2014: contributor

The new file got merged in, update its header guard.
Diapolo commented at 11:59 AM on November 20, 2014: none

ACK
paveljanik force-pushed on Nov 20, 2014
paveljanik commented at 7:09 PM on November 20, 2014: contributor

Rebased. New file src/script/bitcoinconsensus.h added.
Diapolo commented at 8:26 PM on November 20, 2014: none

ACK²
Modify header guards to contain both directory and file name of the header file. 810a065714
paveljanik force-pushed on Nov 25, 2014
laanwj added the label Improvement on Nov 28, 2014
Diapolo commented at 4:29 PM on November 28, 2014: none

Would have been quicker to merge instead of adding a tag :-P.
in src/script/bitcoinconsensus.h:None in 810a065714
```
   2 | @@ -3,8 +3,8 @@
   3 |  // Distributed under the MIT software license, see the accompanying
   4 |  // file COPYING or http://www.opensource.org/licenses/mit-license.php.
   5 |  
   6 | -#ifndef BITCOIN_BITCOINCONSENSUS_H
   7 | -#define BITCOIN_BITCOINCONSENSUS_H
   8 | +#ifndef BITCOIN_SCRIPT_BITCOINCONSENSUS_H
```
laanwj commented at 10:18 AM on December 5, 2014:

I'm not sure about this. bitcoinconsensus.h is a header that we export as interface. Having the internal directory structure reflected in it makes no sense then. Especially as there is a large chance that it will move around later.

sipa commented at 10:26 AM on December 5, 2014:

It should move to include/bitcoinconsensus.h, instead of being in src/script/, imho.

laanwj commented at 11:00 AM on December 5, 2014:

Agreed
laanwj commented at 10:58 AM on December 5, 2014: member

I'll cherry-pick the script_error change and leave bitcoinconsensus.h for now.

Merged via 4c83c0e
laanwj closed this on Dec 5, 2014
paveljanik deleted the branch on Dec 6, 2014
MarcoFalke locked this on Sep 8, 2021

Contributors

Labels