[Mesa-dev] [PATCH v2 14/15] android: nv50/ir: make the code be compatible with stlport

[Chih-Wei Huang]

The stlport uses std::tr1::unordered_set instead of std::unordered_set.
Besides, std::isfinite has to be exported.

Determine whether to build with lollipop libcxx or stlport.

Signed-off-by: Chih-Wei Huang <cwhuang at linux.org.tw>
---
 src/gallium/drivers/nouveau/codegen/nv50_ir.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir.h b/src/gallium/drivers/nouveau/codegen/nv50_ir.h
index f8316f7..2bfc792 100644
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir.h
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir.h
@@ -31,8 +31,13 @@
 #include <vector>
 #if __cplusplus >= 201103L
 #include <unordered_set>
+#ifdef _USING_LIBCXX
 typedef std::unordered_set<void *> voidptr_unordered_set;
 #else
+typedef std::tr1::unordered_set<void *> voidptr_unordered_set;
+using std::isfinite;
+#endif
+#else
 #include <tr1/unordered_set>
 typedef std::tr1::unordered_set<void *> voidptr_unordered_set;
 #endif
-- 
1.9.1