[Mesa-dev] [PATCH] Revert "gallivm: Change getExtent and readByte to non-const with llvm-3.1."

Vinson Lee vlee at freedesktop.org
Wed Feb 29 21:36:59 PST 2012


This reverts commit d5a6c172547d8964f4d4bb79637651decaf9deee.

llvm-3.1svn r151687 makes MemoryObject accessor members const again.

Signed-off-by: Vinson Lee <vlee at freedesktop.org>
---
 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;
-- 
1.7.8.4



More information about the mesa-dev mailing list