Reviewed-by: Ilia Mirkin <imir...@alum.mit.edu>
On Tue, May 23, 2017 at 3:49 PM, Rob Herring <r...@kernel.org> wrote:
> Support for Android 4.4 and earlier has already been removed from mesa.
> Remove this remaining piece from nouveau, too.
>
> Signed-off-by: Rob Herring <r...@kernel.org>
> ---
> .../drivers/nouveau/codegen/unordered_set.h | 32
> ++--------------------
> 1 file changed, 2 insertions(+), 30 deletions(-)
>
> diff --git a/src/gallium/drivers/nouveau/codegen/unordered_set.h
> b/src/gallium/drivers/nouveau/codegen/unordered_set.h
> index 8ef6d462ffd5..0e2945f66630 100644
> --- a/src/gallium/drivers/nouveau/codegen/unordered_set.h
> +++ b/src/gallium/drivers/nouveau/codegen/unordered_set.h
> @@ -1,7 +1,7 @@
> #ifndef __NV50_UNORDERED_SET_H__
> #define __NV50_UNORDERED_SET_H__
>
> -#if (__cplusplus >= 201103L) || defined(ANDROID)
> +#if (__cplusplus >= 201103L)
> #include <unordered_set>
> #else
> #include <tr1/unordered_set>
> @@ -11,36 +11,8 @@ namespace nv50_ir {
>
> #if __cplusplus >= 201103L
> using std::unordered_set;
> -#elif !defined(ANDROID)
> +#else
> using std::tr1::unordered_set;
> -#else // Android release before lollipop
> -using std::isfinite;
> -typedef std::tr1::unordered_set<void *> voidptr_unordered_set;
> -
> -template <typename V>
> -class unordered_set : public voidptr_unordered_set {
> - public:
> - typedef voidptr_unordered_set _base;
> - typedef _base::iterator _biterator;
> - typedef _base::const_iterator const_biterator;
> -
> - class iterator : public _biterator {
> - public:
> - iterator(const _biterator & i) : _biterator(i) {}
> - V operator*() const { return
> reinterpret_cast<V>(*_biterator(*this)); }
> - };
> - class const_iterator : public const_biterator {
> - public:
> - const_iterator(const iterator & i) : const_biterator(i) {}
> - const_iterator(const const_biterator & i) : const_biterator(i) {}
> - const V operator*() const { return reinterpret_cast<const
> V>(*const_biterator(*this)); }
> - };
> -
> - iterator begin() { return _base::begin(); }
> - iterator end() { return _base::end(); }
> - const_iterator begin() const { return _base::begin(); }
> - const_iterator end() const { return _base::end(); }
> -};
> #endif
>
> } // namespace nv50_ir
> --
> 2.11.0
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
