Fix or disable C++11 tests in C++03 mode

llvm-svn: 245531
This commit is contained in:
Eric Fiselier 2015-08-20 01:22:17 +00:00
parent be78c25acb
commit c79a8f7753
4 changed files with 14 additions and 22 deletions

View File

@ -7,6 +7,8 @@
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// UNSUPPORTED: c++98, c++03
#include <exception> #include <exception>
#include <stdlib.h> #include <stdlib.h>
#include <assert.h> #include <assert.h>

View File

@ -7,17 +7,13 @@
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// UNSUPPORTED: c++98, c++03
#include <cassert> #include <cassert>
#include <cstdlib> #include <cstdlib>
#ifndef __has_feature
#define __has_feature(x) 0
#endif
struct A {}; struct A {};
#if __has_feature(cxx_nullptr)
void test1() void test1()
{ {
try try
@ -62,22 +58,6 @@ void catch_nullptr_test() {
} }
} }
#else
void test1()
{
}
void test2()
{
}
template <class Catch>
void catch_nullptr_test()
{
}
#endif
int main() int main()
{ {

View File

@ -9,6 +9,10 @@
#include <cassert> #include <cassert>
#if __cplusplus < 201103L
#define DISABLE_NULLPTR_TESTS
#endif
struct A {}; struct A {};
A a; A a;
const A ca = A(); const A ca = A();
@ -99,6 +103,7 @@ void test5 ()
void test6 () void test6 ()
{ {
#if !defined(DISABLE_NULLPTR_TESTS)
try try
{ {
throw nullptr; throw nullptr;
@ -111,6 +116,7 @@ void test6 ()
{ {
assert (false); assert (false);
} }
#endif
} }
void test7 () void test7 ()
@ -152,6 +158,7 @@ void test8 ()
void test9 () void test9 ()
{ {
#if !defined(DISABLE_NULLPTR_TESTS)
try try
{ {
throw nullptr; throw nullptr;
@ -164,6 +171,7 @@ void test9 ()
{ {
assert (false); assert (false);
} }
#endif
} }
void test10 () void test10 ()

View File

@ -7,6 +7,8 @@
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// UNSUPPORTED: c++98, c++03
#include <cassert> #include <cassert>
#include <tuple> #include <tuple>
#include "support/timer.hpp" #include "support/timer.hpp"