Mesa (master): gallivm: Fix build after LLVM commit 211259

Aaron Watry awatry at kemper.freedesktop.org
Sat Jun 21 00:49:39 UTC 2014


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

Author: Aaron Watry <awatry at gmail.com>
Date:   Fri Jun 20 19:13:30 2014 -0500

gallivm: Fix build after LLVM commit 211259

Signed-off-by: Aaron Watry <awatry at gmail.com>
Reviewed-by: Tom Stellard <thomas.stellard at amd.com>

---

 src/gallium/auxiliary/gallivm/lp_bld_debug.cpp |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
index df26883..413a0c2 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
@@ -51,7 +51,9 @@
 #include <llvm/MC/MCInstPrinter.h>
 #include <llvm/MC/MCRegisterInfo.h>
 
-#if HAVE_LLVM >= 0x0303
+#if HAVE_LLVM >= 0x0305
+#define OwningPtr std::unique_ptr
+#elif HAVE_LLVM >= 0x0303
 #include <llvm/ADT/OwningPtr.h>
 #endif
 




More information about the mesa-commit mailing list