From b032f1cfc305bf00e62b6425decbc93d988263a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Fri, 12 Aug 2016 11:42:32 +0200 Subject: [PATCH] src: no longer need to use std::tr1:: The use of libc++ is now forced on OSX. PR-URL: https://github.com/nodejs/node/pull/8317 Reviewed-By: Ben Noordhuis Reviewed-By: Ali Ijaz Sheikh --- src/util.h | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/src/util.h b/src/util.h index 9ddc2201a6f412..25f2eb01783144 100644 --- a/src/util.h +++ b/src/util.h @@ -11,16 +11,7 @@ #include #include -// OSX 10.9 defaults to libc++ which provides a C++11 header. -#if defined(__APPLE__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1090 -#define USE_TR1_TYPE_TRAITS -#endif - -#ifdef USE_TR1_TYPE_TRAITS -#include // NOLINT(build/c++tr1) -#else #include // std::remove_reference -#endif namespace node { @@ -70,11 +61,7 @@ NO_RETURN void Abort(); NO_RETURN void Assert(const char* const (*args)[4]); void DumpBacktrace(FILE* fp); -#ifdef USE_TR1_TYPE_TRAITS -template using remove_reference = std::tr1::remove_reference; -#else template using remove_reference = std::remove_reference; -#endif #define FIXED_ONE_BYTE_STRING(isolate, string) \ (node::OneByteString((isolate), (string), sizeof(string) - 1))