diff options
author | Vinson Lee <vlee@freedesktop.org> | 2012-02-08 21:45:27 -0800 |
---|---|---|
committer | Vinson Lee <vlee@freedesktop.org> | 2012-02-10 23:24:48 -0800 |
commit | d5a6c172547d8964f4d4bb79637651decaf9deee (patch) | |
tree | 03a31175812d5c3dfed5002fb016140ecfc0c529 /src/gallium/auxiliary | |
parent | 3340b47c2280346ba2f44dde44466f09d898b9d8 (diff) | |
download | external_mesa3d-d5a6c172547d8964f4d4bb79637651decaf9deee.zip external_mesa3d-d5a6c172547d8964f4d4bb79637651decaf9deee.tar.gz external_mesa3d-d5a6c172547d8964f4d4bb79637651decaf9deee.tar.bz2 |
gallivm: Change getExtent and readByte to non-const with llvm-3.1.
Fix build with llvm-3.1svn.
llvm-3.1svn r149918 changed BufferMemoryObject::getExtent and
BufferMemoryObject::readByte from const member functions to non-const
member functions in include/llvm/Support/MemoryObject.h.
Signed-off-by: Vinson Lee <vlee@freedesktop.org>
Reviewed-by: José Fonseca <jfonseca@vmware.com>
Diffstat (limited to 'src/gallium/auxiliary')
-rw-r--r-- | src/gallium/auxiliary/gallivm/lp_bld_debug.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp index be8d788..5d98763 100644 --- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp +++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp @@ -146,12 +146,20 @@ 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; |