Mesa (master): r600g/sb: fix struct/class declaration conflicts
Bas Nieuwenhuizen
bnieuwenhuizen at kemper.freedesktop.org
Sun Sep 18 07:26:22 UTC 2016
Module: Mesa
Branch: master
Commit: 15804c4b9093179f6dd6be2b3a45e18b1318d5a3
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=15804c4b9093179f6dd6be2b3a45e18b1318d5a3
Author: Martina Kollarova <martina.kollarova at intel.com>
Date: Fri Sep 16 18:54:53 2016 +0300
r600g/sb: fix struct/class declaration conflicts
A couple of forward-declarations were causing warnings in clang:
'value' defined as a class here but previously declared as a struct
[-Wmismatched-tags]
Signed-off-by: Martina Kollarova <martina.kollarova at intel.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
---
src/gallium/drivers/r600/sb/sb_ir.h | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/src/gallium/drivers/r600/sb/sb_ir.h b/src/gallium/drivers/r600/sb/sb_ir.h
index c612e6c..4fc4da2 100644
--- a/src/gallium/drivers/r600/sb/sb_ir.h
+++ b/src/gallium/drivers/r600/sb/sb_ir.h
@@ -263,8 +263,6 @@ public:
}
};
-class value;
-
enum value_kind {
VLK_REG,
VLK_REL_REG,
@@ -433,8 +431,6 @@ inline value_flags& operator &=(value_flags &l, value_flags r) {
return l;
}
-struct value;
-
sb_ostream& operator << (sb_ostream &o, value &v);
typedef uint32_t value_hash;
@@ -467,7 +463,7 @@ enum constraint_kind {
class shader;
class sb_value_pool;
-class ra_chunk;
+struct ra_chunk;
class ra_constraint;
class value {
More information about the mesa-commit
mailing list