Skip to content

Commit b032f1c

Browse files
targosjasnell
authored andcommitted
src: no longer need to use std::tr1::
The use of libc++ is now forced on OSX. PR-URL: #8317 Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Ali Ijaz Sheikh <[email protected]>
1 parent b311906 commit b032f1c

File tree

1 file changed

+0
-13
lines changed

1 file changed

+0
-13
lines changed

src/util.h

-13
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,7 @@
1111
#include <stdio.h>
1212
#include <stdlib.h>
1313

14-
// OSX 10.9 defaults to libc++ which provides a C++11 <type_traits> header.
15-
#if defined(__APPLE__) && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 1090
16-
#define USE_TR1_TYPE_TRAITS
17-
#endif
18-
19-
#ifdef USE_TR1_TYPE_TRAITS
20-
#include <tr1/type_traits> // NOLINT(build/c++tr1)
21-
#else
2214
#include <type_traits> // std::remove_reference
23-
#endif
2415

2516
namespace node {
2617

@@ -70,11 +61,7 @@ NO_RETURN void Abort();
7061
NO_RETURN void Assert(const char* const (*args)[4]);
7162
void DumpBacktrace(FILE* fp);
7263

73-
#ifdef USE_TR1_TYPE_TRAITS
74-
template <typename T> using remove_reference = std::tr1::remove_reference<T>;
75-
#else
7664
template <typename T> using remove_reference = std::remove_reference<T>;
77-
#endif
7865

7966
#define FIXED_ONE_BYTE_STRING(isolate, string) \
8067
(node::OneByteString((isolate), (string), sizeof(string) - 1))

0 commit comments

Comments
 (0)