Permalink
Browse files

src: no longer need to use std::tr1::

The use of libc++ is now forced on OSX.

PR-URL: #8317
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com>
  • Loading branch information...
targos authored and jasnell committed Aug 12, 2016
1 parent b311906 commit b032f1cfc305bf00e62b6425decbc93d988263a1
Showing with 0 additions and 13 deletions.
  1. +0 −13 src/util.h
@@ -11,16 +11,7 @@
#include <stdio.h>
#include <stdlib.h>
// OSX 10.9 defaults to libc++ which provides a C++11 <type_traits> header.
#if defined(__APPLE__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1090
#define USE_TR1_TYPE_TRAITS
#endif
#ifdef USE_TR1_TYPE_TRAITS
#include <tr1/type_traits> // NOLINT(build/c++tr1)
#else
#include <type_traits> // 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 <typename T> using remove_reference = std::tr1::remove_reference<T>;
#else
template <typename T> using remove_reference = std::remove_reference<T>;
#endif
#define FIXED_ONE_BYTE_STRING(isolate, string) \
(node::OneByteString((isolate), (string), sizeof(string) - 1))

0 comments on commit b032f1c

Please sign in to comment.