diff options
| author | Francisco Jerez <[email protected]> | 2018-02-24 18:37:34 -0800 |
|---|---|---|
| committer | Francisco Jerez <[email protected]> | 2018-02-27 11:38:18 -0800 |
| commit | 69b4a9d21d00e1f72b52e818cc059ee1642f263e (patch) | |
| tree | 68506ea49d7ffebb4c0d317c9c80fbd6b2c104ee /src/compiler | |
| parent | 9f223d860b6fed0ae296bcd1b8ae14dca66a7986 (diff) | |
util/bitset: Make C++ wrapper trivially constructible.
In order to fix a build failure on compilers not implementing
unrestricted unions, which is a C++11 feature.
v2: Provide signed integer comparison and assignment operators instead
of BITSET_WORD ones to avoid spurious ambiguity warnings on
comparisons with a signed integer literal.
Fixes: ba79a90fb52e1e81fb "glsl: Switch ast_type_qualifier to a 128-bit bitset."
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105238
Tested-by: Roland Scheidegger <[email protected]>
Tested-By: George Kyriazis <[email protected]>
Reviewed-by: Roland Scheidegger <[email protected]>
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/glsl/ast.h | 2 | ||||
| -rw-r--r-- | src/compiler/glsl/glsl_parser.yy | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/src/compiler/glsl/ast.h b/src/compiler/glsl/ast.h index e5e4b572fff..a1ec0d566f4 100644 --- a/src/compiler/glsl/ast.h +++ b/src/compiler/glsl/ast.h @@ -477,8 +477,6 @@ struct ast_type_qualifier { DECLARE_BITSET_T(bitset_t, 128); union flags { - flags() : i(0) {} - struct { unsigned invariant:1; unsigned precise:1; diff --git a/src/compiler/glsl/glsl_parser.yy b/src/compiler/glsl/glsl_parser.yy index f1986ed0a8a..e5ea41d4dff 100644 --- a/src/compiler/glsl/glsl_parser.yy +++ b/src/compiler/glsl/glsl_parser.yy @@ -96,7 +96,6 @@ static bool match_layout_qualifier(const char *s1, const char *s2, %parse-param {struct _mesa_glsl_parse_state *state} %union { - YYSTYPE() {} int n; int64_t n64; float real; |