diff options
| author | Vinson Lee <vlee@freedesktop.org> | 2012-02-29 21:20:53 -0800 |
|---|---|---|
| committer | Vinson Lee <vlee@freedesktop.org> | 2012-03-01 10:36:06 -0800 |
| commit | 834f515988ca894b3828a4929d36cafd349eade8 (patch) | |
| tree | 9fac2f50764a0dd604f1d1c3458343cedc871d1d | |
| parent | 0605c6d861d0e59baadf725f3530319b32b2a344 (diff) | |
| download | external_mesa3d-834f515988ca894b3828a4929d36cafd349eade8.zip external_mesa3d-834f515988ca894b3828a4929d36cafd349eade8.tar.gz external_mesa3d-834f515988ca894b3828a4929d36cafd349eade8.tar.bz2 | |
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 <vlee@freedesktop.org>
Reviewed-by: Brian Paul <brianp@vmware.com>
| -rw-r--r-- | src/gallium/auxiliary/gallivm/lp_bld_debug.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp index 43aaf64..11209da 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; |