Module: Mesa
Branch: 10.2
Commit: 5750eb334207bd65dc84a033b60f0e9de0e10593
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=5750eb334207bd65dc84a033b60f0e9de0e10593

Author: Aaron Watry <[email protected]>
Date:   Fri Jun 20 19:13:30 2014 -0500

gallivm: Fix build after LLVM commit 211259

Signed-off-by: Aaron Watry <[email protected]>
Reviewed-by: Tom Stellard <[email protected]>
(cherry picked from commit 564821c917f4a9d5a0de2ee77b90b0cd85e3d3a6)
Nominated-by: Emil Velikov <[email protected]>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=83567

---

 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 2629aaa..4a6dc39 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
+++ b/src/gallium/auxiliary/gallivm/lp_bld_debug.cpp
@@ -61,7 +61,9 @@
 #include <llvm/MC/MCRegisterInfo.h>
 #endif /* HAVE_LLVM >= 0x0301 */
 
-#if HAVE_LLVM >= 0x0303
+#if HAVE_LLVM >= 0x0305
+#define OwningPtr std::unique_ptr
+#elif HAVE_LLVM >= 0x0303
 #include <llvm/ADT/OwningPtr.h>
 #endif
 

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

Reply via email to