From 834f515988ca894b3828a4929d36cafd349eade8 Mon Sep 17 00:00:00 2001 From: Vinson Lee Date: Wed, 29 Feb 2012 21:20:53 -0800 Subject: [PATCH] Revert "gallivm: Change getExtent and readByte to non-const with llvm-3.1." This reverts commit d5a6c172547d8964f4d4bb79637651decaf9deee. llvm-3.1svn r151687 makes MemoryObject accessor members const again. Signed-off-by: Vinson Lee Reviewed-by: Brian Paul --- src/gallium/auxiliary/gallivm/lp_bld_debug.cpp | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp index 43aaf64a64e..11209da78ef 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp +++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp @@ -146,20 +146,12 @@ public: return 0; } -#if HAVE_LLVM >= 0x0301 - uint64_t getExtent() -#else uint64_t getExtent() const -#endif { return Length; } -#if HAVE_LLVM >= 0x0301 - int readByte(uint64_t addr, uint8_t *byte) -#else int readByte(uint64_t addr, uint8_t *byte) const -#endif { if (addr > getExtent()) return -1; -- 2.30.2