[Mesa-dev] [PATCH] gallium: fix struct/class declaration conflicts

Bas Nieuwenhuizen bas at basnieuwenhuizen.nl
Fri Sep 16 15:13:35 UTC 2016


I don't think the "gallium:" commit message prefix is correct here.
Looking at the logs it should be "r600g/sb:".

With that change:

Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>

Do you need someone to push it for you?

- Bas

On Fri, Sep 16, 2016 at 4:58 PM, Martina Kollarova
<martina.kollarova at intel.com> wrote:
> 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>
> ---
>  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 {
> --
> 1.9.1
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev


More information about the mesa-dev mailing list