From a7b8e16dc6fb3e076f0bce9b8c68fdce31837848 Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Tue, 27 Mar 2012 21:51:17 -0700 Subject: [PATCH] gallivm: Fix method overriding in raw_debug_ostream. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Use matching type qualifers to avoid method hiding. Signed-off-by: Vinson Lee Reviewed-by: José Fonseca --- src/gallium/auxiliary/gallivm/lp_bld_debug.cpp | 6 +++--- 1 file 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 903c8782f8d..c5afff09ae6 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 }; -- 2.30.2