On 03/01/2012 08:33 AM, Johannes Obermayr wrote:
With commit 151687 llvm changed getExtent and readByte back to const.

This reverts commit d5a6c172547d8964f4d4bb79637651decaf9deee.
---
  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;

Vinson Lee posted the same patch a little while ago. I gave it my R-b. He'll probably commit it soon.

-Brian

_______________________________________________
mesa-dev mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

Reply via email to