Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-15 21:18:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

clang-format: Enforce ordering of includes in ZBody

Browse source
This commit is contained in:
Tim Wojtulewicz 2021-09-24 14:56:57 -07:00
parent 07e276ab2e
commit cb99ae2b7c
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.clang-format
View file

@ -30,7 +30,7 @@ BreakBeforeBraces: Whitesmiths
# SplitEmptyNamespace: false # SplitEmptyNamespace: false
AccessModifierOffset: -4 AccessModifierOffset: -4
AlignAfterOpenBracket: true AlignAfterOpenBracket: Align
AlignTrailingComments: false AlignTrailingComments: false
AllowShortBlocksOnASingleLine: Empty AllowShortBlocksOnASingleLine: Empty
AllowShortEnumsOnASingleLine: true AllowShortEnumsOnASingleLine: true

4
src/script_opt/ZAM/ZBody.cc
View file

@ -313,9 +313,11 @@ ValPtr ZBody::DoExec(Frame* f, int start_pc, StmtFlowType& flow)
case OP_NOP: case OP_NOP:
break; break;
// These must stay in this order or the build fails. // These must stay in this order or the build fails.
// clang-format off
#include "ZAM-EvalMacros.h" #include "ZAM-EvalMacros.h"
#include "ZAM-EvalDefs.h" #include "ZAM-EvalDefs.h"
// clang-format on
default: default:
reporter->InternalError("bad ZAM opcode"); reporter->InternalError("bad ZAM opcode");