Module: Mesa
Branch: master
Commit: 69b4a9d21d00e1f72b52e818cc059ee1642f263e
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=69b4a9d21d00e1f72b52e818cc059ee1642f263e
Author: Francisco Jerez <curroje...@riseup.net>
Date: Sat Feb 24 18:37:34 2018 -0800
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 <srol...@vmware.com>
Tested-By: George Kyriazis <george.kyria...@intel.com>
Reviewed-by: Roland Scheidegger <srol...@vmware.com>
---
src/compiler/glsl/ast.h | 2 --
src/compiler/glsl/glsl_parser.yy | 1 -
src/util/bitset.h | 37 ++++++++++++++++++++-----------------
3 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/src/compiler/glsl/ast.h b/src/compiler/glsl/ast.h
index e5e4b572ff..a1ec0d566f 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 f1986ed0a8..e5ea41d4df 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;
diff --git a/src/util/bitset.h b/src/util/bitset.h
index 7bb5f3c83c..b4c2152023 100644
--- a/src/util/bitset.h
+++ b/src/util/bitset.h
@@ -142,23 +142,6 @@ __bitset_next_set(unsigned i, BITSET_WORD *tmp,
* it as, and N is the number of bits in the bitset.
*/
#define DECLARE_BITSET_T(T, N) struct T { \
- /* XXX - Replace this with an implicitly-defined \
- * constructor when support for C++11 defaulted \
- * constructors can be assumed (available on GCC 4.4 and \
- * later) in order to make the object trivially \
- * constructible like a fundamental integer type for \
- * convenience. \
- */ \
- T() \
- { \
- } \
- \
- T(BITSET_WORD x) \
- { \
- for (unsigned i = 0; i < BITSET_WORDS(N); i++, x = 0) \
- words[i] = x; \
- } \
- \
EXPLICIT_CONVERSION \
operator bool() const \
{ \
@@ -168,6 +151,13 @@ __bitset_next_set(unsigned i, BITSET_WORD *tmp,
return false; \
} \
\
+ T & \
+ operator=(int x) \
+ { \
+ const T c = {{ (BITSET_WORD)x }}; \
+ return *this = c; \
+ } \
+ \
friend bool \
operator==(const T &b, const T &c) \
{ \
@@ -180,6 +170,19 @@ __bitset_next_set(unsigned i, BITSET_WORD *tmp,
return !(b == c); \
} \
\
+ friend bool \
+ operator==(const T &b, int x) \
+ { \
+ const T c = {{ (BITSET_WORD)x }}; \
+ return b == c; \
+ } \
+ \
+ friend bool \
+ operator!=(const T &b, int x) \
+ { \
+ return !(b == x); \
+ } \
+ \
friend T \
operator~(const T &b) \
{ \
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-commit
