diff options
| author | Peter Powell <petpow@saberuk.com> | 2015-02-18 15:20:58 +0000 |
|---|---|---|
| committer | Peter Powell <petpow@saberuk.com> | 2015-02-18 15:46:13 +0000 |
| commit | 100048eb41b2b8ab4565ea19eb25e1a0acdd07af (patch) | |
| tree | 064acc609f834d13413fc21c53e2d4c6ca033594 /make | |
| parent | 4e9af81504de220aee3fc41df9e405faa1b92738 (diff) | |
Add the <type_traits> header to the compiler test file.
Diffstat (limited to 'make')
| -rw-r--r-- | make/configure.pm | 2 | ||||
| -rw-r--r-- | make/test/compiler.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/make/configure.pm b/make/configure.pm index a89e139c9..2cd5beb60 100644 --- a/make/configure.pm +++ b/make/configure.pm @@ -96,7 +96,7 @@ sub __get_template_settings($$$) { sub __test_compiler($) { my $compiler = shift; return 0 unless run_test("`$compiler`", !system "$compiler -v >/dev/null 2>&1"); - return 0 unless run_test("`$compiler`", test_file($compiler, 'compiler.cpp'), 'compatible'); + return 0 unless run_test("`$compiler`", test_file($compiler, 'compiler.cpp', '-fno-rtti'), 'compatible'); return 1; } diff --git a/make/test/compiler.cpp b/make/test/compiler.cpp index 1c3e1d875..ae782bf03 100644 --- a/make/test/compiler.cpp +++ b/make/test/compiler.cpp @@ -18,8 +18,10 @@ #include <iostream> #if defined _LIBCPP_VERSION +# include <type_traits> # include <unordered_map> #else +# include <tr1/type_traits> # include <tr1/unordered_map> #endif |