From: Vinson Lee <vlee@freedesktop.org>
Date: Thu, 1 Mar 2012 05:20:53 +0000 (-0800)
Subject: Revert "gallivm: Change getExtent and readByte to non-const with llvm-3.1."
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=834f515988ca894b3828a4929d36cafd349eade8;p=mesa.git

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>
---

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;