util: Remove EXPLICIT_CONVERSION macro and use c++11 explicit directly

Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19895>

diff --git a/src/util/bitset.h b/src/util/bitset.h
index e1e5962..9765345 100644 (file)
--- a/src/util/bitset.h
+++ b/src/util/bitset.h
@@ -446,7 +446,7 @@ __bitset_next_range(unsigned *start, unsigned *end, const BITSET_WORD *set,
  * it as, and N is the number of bits in the bitset.
  */
 #define DECLARE_BITSET_T(T, N) struct T {                       \
-      EXPLICIT_CONVERSION                                       \
+      explicit                                                  \
       operator bool() const                                     \
       {                                                         \
          for (unsigned i = 0; i < BITSET_WORDS(N); i++)         \

diff --git a/src/util/macros.h b/src/util/macros.h
index f3870d2..cb6b5a7 100644 (file)
--- a/src/util/macros.h
+++ b/src/util/macros.h
@@ -355,16 +355,6 @@ do {                       \
 /** Checks is a value is a power of two. Does not handle zero. */
 #define IS_POT(v) (((v) & ((v) - 1)) == 0)
 
-/**
- * Macro for declaring an explicit conversion operator.  Defaults to an
- * implicit conversion if C++11 is not supported.
- */
-#if __cplusplus >= 201103L
-#define EXPLICIT_CONVERSION explicit
-#elif defined(__cplusplus)
-#define EXPLICIT_CONVERSION
-#endif
-
 /** Set a single bit */
 #define BITFIELD_BIT(b)      (1u << (b))
 /** Set all bits up to excluding bit b */