[Mesa-dev] [PATCH v2 1/3] nv50/ir: support different unordered_set implementations

[Emil Velikov]

Hi Chih-Wei,
On 19 June 2015 at 19:00, Chih-Wei Huang <cwhuang at android-x86.org> wrote:
> If build with C++11 standard, use std::unordered_set.
>
> Otherwise if build on old Android version with stlport,
> use std::tr1::unordered_set with a wrapper class.
>
> Otherwise use std::tr1::unordered_set.
>
> Signed-off-by: Chih-Wei Huang <cwhuang at linux.org.tw>
> ---
>  Android.common.mk                                  |  2 +-
>  src/gallium/drivers/nouveau/codegen/nv50_ir.h      |  8 ++--
>  .../nouveau/codegen/nv50_ir_lowering_nvc0.cpp      |  4 +-
>  .../nouveau/codegen/nv50_ir_lowering_nvc0.h        |  4 +-
>  src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp |  5 +--
>  .../drivers/nouveau/codegen/unordered_set.h        | 48 ++++++++++++++++++++++
>  6 files changed, 58 insertions(+), 13 deletions(-)
>  create mode 100644 src/gallium/drivers/nouveau/codegen/unordered_set.h
>
> diff --git a/Android.common.mk b/Android.common.mk
> index d662d60..35dcda2 100644
> --- a/Android.common.mk
> +++ b/Android.common.mk
> @@ -77,7 +77,7 @@ LOCAL_CFLAGS += \
>  endif
>
>  LOCAL_CPPFLAGS += \
> -       $(if $(filter true,$(MESA_LOLLIPOP_BUILD)),-D_USING_LIBCXX) \
> +       $(if $(filter true,$(MESA_LOLLIPOP_BUILD)),-std=c++11) \
Please expand like elsewhere in the build. Additionally this is a C++
only flag, so LOCAL_CPPFLAGS does not sound like the right place.
Shame that the Android folk did not like (f'd up) the standard
CXXFLAGS.

ifeq ....MESA_LOLLIPOP_BUILD...
LOCAL_C??FLAGS += \
    -std=c++11
endif

Thanks
Emil