[Mesa-dev] [PATCH] gallivm: Fix method overriding in raw_debug_ostream.

Jose Fonseca jfonseca at vmware.com
Wed Mar 28 07:39:15 PDT 2012


Looks good to me. Thanks.

Jose

----- Original Message -----
> Use matching type qualifers to avoid method hiding.
> 
> Signed-off-by: Vinson Lee <vlee at freedesktop.org>
> ---
>  src/gallium/auxiliary/gallivm/lp_bld_debug.cpp |    6 +++---
>  1 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
> b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
> index 903c878..c5afff0 100644
> --- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
> +++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
> @@ -83,12 +83,12 @@ class raw_debug_ostream :
>     uint64_t pos;
>  
>     void write_impl(const char *Ptr, size_t Size);
> -   uint64_t current_pos() { return pos; }
> -   uint64_t current_pos() const { return pos; }
>  
>  #if HAVE_LLVM >= 0x207
> -   uint64_t preferred_buffer_size() { return 512; }
> +   uint64_t current_pos() const { return pos; }
> +   size_t preferred_buffer_size() const { return 512; }
>  #else
> +   uint64_t current_pos() { return pos; }
>     size_t preferred_buffer_size() { return 512; }
>  #endif
>  };
> --
> 1.7.9.1
> 
> _______________________________________________
> mesa-dev mailing list
> mesa-dev at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/mesa-dev
> 


More information about the mesa-dev mailing list