Skip to content

Commit 8d65c0c

Browse files
committed
rename constant to avoid conflict on macOS
1 parent 4dc502f commit 8d65c0c

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

src/lammpssyntax.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ constexpr int CMD_SHIFT = 6; ///< bit position of the command spec index
195195
constexpr int CMD_MASK = 0x1fff; ///< 13 bits for the command spec index + 1
196196
constexpr int ARG_SHIFT = 19; ///< bit position of the argument counter
197197
constexpr int ARG_MASK = 0xff; ///< 8 bits for the argument counter
198-
constexpr int ARG_MAX = ARG_MASK; ///< saturation value of the argument counter
198+
constexpr int ARG_MAXX = ARG_MASK; ///< saturation value of the argument counter
199199

200200
/// extract the flag bits from a block state
201201
inline int flags(int state)
@@ -219,7 +219,7 @@ inline int argsUsed(int state)
219219
inline int pack(int flagbits, int cmdidx, int nargs)
220220
{
221221
return (flagbits & FLAG_MASK) | (((cmdidx + 1) & CMD_MASK) << CMD_SHIFT) |
222-
((qMin(nargs, ARG_MAX) & ARG_MASK) << ARG_SHIFT);
222+
((qMin(nargs, ARG_MAXX) & ARG_MASK) << ARG_SHIFT);
223223
}
224224

225225
/// replace the command spec index in a block state (-1 for none)

0 commit comments

Comments
 (0)