Mesa (master): gallivm: Change getExtent and readByte to non-const with llvm-3.1.

Vinson Lee vlee at kemper.freedesktop.org
Sat Feb 11 07:27:16 UTC 2012


Module: Mesa
Branch: master
Commit: d5a6c172547d8964f4d4bb79637651decaf9deee
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d5a6c172547d8964f4d4bb79637651decaf9deee

Author: Vinson Lee <vlee at freedesktop.org>
Date:   Wed Feb  8 21:45:27 2012 -0800

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 at freedesktop.org>
Reviewed-by: José Fonseca <jfonseca at vmware.com>

---

 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;




More information about the mesa-commit mailing list