aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Wakely <jwakely@redhat.com>2017-04-20 14:04:28 +0100
committerJonathan Wakely <redi@gcc.gnu.org>2017-04-20 14:04:28 +0100
commit1b36f6036e5be4dd9110b2fa9bebdd9db48e6ae1 (patch)
tree1e04bb2661fbcbf7dce93081584e0581a477d5fa
parenta05dd05f299282435976fd058a50086cb0f93ac1 (diff)
downloadgcc-1b36f6036e5be4dd9110b2fa9bebdd9db48e6ae1.zip
gcc-1b36f6036e5be4dd9110b2fa9bebdd9db48e6ae1.tar.gz
gcc-1b36f6036e5be4dd9110b2fa9bebdd9db48e6ae1.tar.bz2
PR79862 check macro for type aliases that depend on <stdint.h>
PR libstdc++/79862 * include/std/atomic [!_GLIBCXX_USE_C99_STDINT_TR1] (atomic_int8_t) (atomic_uint8_t, atomic_int16_t, atomic_uint16_t, atomic_int32_t, (atomic_uint32_t, atomic_int64_t, atomic_uint64_t) (atomic_int_least8_t, atomic_uint_least8_t, atomic_int_least16_t) (atomic_uint_least16_t, atomic_int_least32_t, atomic_uint_least32_t) (atomic_int_least64_t, atomic_uint_least64_t, atomic_int_fast8_t) (atomic_uint_fast8_t, atomic_int_fast16_t, atomic_uint_fast16_t) (atomic_int_fast32_t, atomic_uint_fast32_t, atomic_int_fast64_t) (atomic_uint_fast64_t, atomic_intmax_t, atomic_uintmax_t): Don't define. From-SVN: r247021
-rw-r--r--libstdc++-v3/ChangeLog14
-rw-r--r--libstdc++-v3/include/std/atomic12
2 files changed, 21 insertions, 5 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 46c20d1..fa79d16 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,17 @@
+2017-04-20 Jonathan Wakely <jwakely@redhat.com>
+
+ PR libstdc++/79862
+ * include/std/atomic [!_GLIBCXX_USE_C99_STDINT_TR1] (atomic_int8_t)
+ (atomic_uint8_t, atomic_int16_t, atomic_uint16_t, atomic_int32_t,
+ (atomic_uint32_t, atomic_int64_t, atomic_uint64_t)
+ (atomic_int_least8_t, atomic_uint_least8_t, atomic_int_least16_t)
+ (atomic_uint_least16_t, atomic_int_least32_t, atomic_uint_least32_t)
+ (atomic_int_least64_t, atomic_uint_least64_t, atomic_int_fast8_t)
+ (atomic_uint_fast8_t, atomic_int_fast16_t, atomic_uint_fast16_t)
+ (atomic_int_fast32_t, atomic_uint_fast32_t, atomic_int_fast64_t)
+ (atomic_uint_fast64_t, atomic_intmax_t, atomic_uintmax_t): Don't
+ define.
+
2017-04-19 Jonathan Wakely <jwakely@redhat.com>
* doc/xml/manual/abi.xml: Rephrase one of the references to the
diff --git a/libstdc++-v3/include/std/atomic b/libstdc++-v3/include/std/atomic
index 5b252a4..4b583c1 100644
--- a/libstdc++-v3/include/std/atomic
+++ b/libstdc++-v3/include/std/atomic
@@ -909,7 +909,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/// atomic_char32_t
typedef atomic<char32_t> atomic_char32_t;
-
+#ifdef _GLIBCXX_USE_C99_STDINT_TR1
// _GLIBCXX_RESOLVE_LIB_DEFECTS
// 2441. Exact-width atomic typedefs should be provided
@@ -986,6 +986,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/// atomic_uint_fast64_t
typedef atomic<uint_fast64_t> atomic_uint_fast64_t;
+#endif
/// atomic_intptr_t
@@ -997,15 +998,16 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/// atomic_size_t
typedef atomic<size_t> atomic_size_t;
+ /// atomic_ptrdiff_t
+ typedef atomic<ptrdiff_t> atomic_ptrdiff_t;
+
+#ifdef _GLIBCXX_USE_C99_STDINT_TR1
/// atomic_intmax_t
typedef atomic<intmax_t> atomic_intmax_t;
/// atomic_uintmax_t
typedef atomic<uintmax_t> atomic_uintmax_t;
-
- /// atomic_ptrdiff_t
- typedef atomic<ptrdiff_t> atomic_ptrdiff_t;
-
+#endif
// Function definitions, atomic_flag operations.
inline bool