diff options
author | Vinson Lee <vlee@freedesktop.org> | 2012-03-27 21:51:17 -0700 |
---|---|---|
committer | Vinson Lee <vlee@freedesktop.org> | 2012-03-28 22:46:17 -0700 |
commit | a7b8e16dc6fb3e076f0bce9b8c68fdce31837848 (patch) | |
tree | 73b1b3b792b5ed8b6ad87bf88a3d9a4f1e37c530 /src/gallium/auxiliary/gallivm | |
parent | 4a976b60b1139021ef00e722361b7e1ad8e0810d (diff) | |
download | external_mesa3d-a7b8e16dc6fb3e076f0bce9b8c68fdce31837848.zip external_mesa3d-a7b8e16dc6fb3e076f0bce9b8c68fdce31837848.tar.gz external_mesa3d-a7b8e16dc6fb3e076f0bce9b8c68fdce31837848.tar.bz2 |
gallivm: Fix method overriding in raw_debug_ostream.
Use matching type qualifers to avoid method hiding.
Signed-off-by: Vinson Lee <vlee@freedesktop.org>
Reviewed-by: José Fonseca <jfonseca@vmware.com>
Diffstat (limited to 'src/gallium/auxiliary/gallivm')
-rw-r--r-- | 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 }; |