summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--clang/lib/Headers/stdatomic.h4
-rw-r--r--clang/test/Headers/stdatomic.cpp10
2 files changed, 0 insertions, 14 deletions
diff --git a/clang/lib/Headers/stdatomic.h b/clang/lib/Headers/stdatomic.h
index c05702c321d..b4845a74e49 100644
--- a/clang/lib/Headers/stdatomic.h
+++ b/clang/lib/Headers/stdatomic.h
@@ -31,10 +31,6 @@
# include_next <stdatomic.h>
#else
-#if !defined(__ALLOW_STDC_ATOMICS_IN_CXX__) && defined(__cplusplus)
-#error "<stdatomic.h> is incompatible with the C++ standard library; define __ALLOW_STDC_ATOMICS_IN_CXX__ to proceed."
-#endif
-
#include <stddef.h>
#include <stdint.h>
diff --git a/clang/test/Headers/stdatomic.cpp b/clang/test/Headers/stdatomic.cpp
deleted file mode 100644
index 322f26a2d66..00000000000
--- a/clang/test/Headers/stdatomic.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-// RUN: %clang_cc1 %s -verify
-// RUN: %clang_cc1 -D__ALLOW_STDC_ATOMICS_IN_CXX__ %s -verify
-
-#include <stdatomic.h>
-
-#ifndef __ALLOW_STDC_ATOMICS_IN_CXX__
-// expected-error@stdatomic.h:* {{<stdatomic.h> is incompatible with the C++ standard library}}
-#else
-// expected-no-diagnostics
-#endif
OpenPOWER on IntegriCloud