diff options
| author | Mathias Preiner <mathias.preiner@gmail.com> | 2019-04-24 15:39:24 -0700 |
|---|---|---|
| committer | Andres Noetzli <andres.noetzli@gmail.com> | 2019-04-24 15:39:24 -0700 |
| commit | 2ab48defab1f0c8918cd7612c1943be7503e4d30 (patch) | |
| tree | ab8fafc614f5fceef133a3a32f27a0fddcd3c717 /src/expr/node_builder.h | |
| parent | 5f716f5aac730f976eac538cfbf47dcc651e54f7 (diff) | |
Do not use __ prefix for header guards. (#2974)
Fixes 2887.
Diffstat (limited to 'src/expr/node_builder.h')
| -rw-r--r-- | src/expr/node_builder.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/expr/node_builder.h b/src/expr/node_builder.h index 299960c1d..9128bc190 100644 --- a/src/expr/node_builder.h +++ b/src/expr/node_builder.h @@ -152,8 +152,8 @@ #include "expr/node.h" #include "expr/type_node.h" -#ifndef __CVC4__NODE_BUILDER_H -#define __CVC4__NODE_BUILDER_H +#ifndef CVC4__NODE_BUILDER_H +#define CVC4__NODE_BUILDER_H #include <cstdlib> #include <iostream> @@ -274,7 +274,7 @@ class NodeBuilder { */ inline void realloc() { size_t newSize = 2 * size_t(d_nvMaxChildren); - size_t hardLimit = (1lu << __CVC4__EXPR__NODE_VALUE__NBITS__NCHILDREN) - 1; + size_t hardLimit = (1lu << CVC4__EXPR__NODE_VALUE__NBITS__NCHILDREN) - 1; realloc(__builtin_expect( ( newSize > hardLimit ), false ) ? hardLimit : newSize); } @@ -774,9 +774,9 @@ template <unsigned nchild_thresh> void NodeBuilder<nchild_thresh>::realloc(size_t toSize) { Assert( toSize > d_nvMaxChildren, "attempt to realloc() a NodeBuilder to a smaller/equal size!" ); - Assert( toSize < (1lu << __CVC4__EXPR__NODE_VALUE__NBITS__NCHILDREN), + Assert( toSize < (1lu << CVC4__EXPR__NODE_VALUE__NBITS__NCHILDREN), "attempt to realloc() a NodeBuilder to size %u (beyond hard limit of %u)", - toSize, (1lu << __CVC4__EXPR__NODE_VALUE__NBITS__NCHILDREN) - 1 ); + toSize, (1lu << CVC4__EXPR__NODE_VALUE__NBITS__NCHILDREN) - 1 ); if(__builtin_expect( ( nvIsAllocated() ), false )) { // Ensure d_nv is not modified on allocation failure @@ -1342,4 +1342,4 @@ std::ostream& operator<<(std::ostream& out, const NodeBuilder<nchild_thresh>& nb }/* CVC4 namespace */ -#endif /* __CVC4__NODE_BUILDER_H */ +#endif /* CVC4__NODE_BUILDER_H */ |