aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2010-11-02 13:39:59 -0400
committerJason Merrill <jason@gcc.gnu.org>2010-11-02 13:39:59 -0400
commit6c0daa3ce135c67f660664dc95e68651e7faf686 (patch)
tree3289abe6bb80ee4f1913ac615c1c02adb3efcbce
parente69afb29dc3f151d0768be9ce610da4348b0d62b (diff)
downloadgcc-6c0daa3ce135c67f660664dc95e68651e7faf686.zip
gcc-6c0daa3ce135c67f660664dc95e68651e7faf686.tar.gz
gcc-6c0daa3ce135c67f660664dc95e68651e7faf686.tar.bz2
* include/bits/atomic_0.h (_ATOMIC_CMPEXCHNG_): Use C-style cast.
From-SVN: r166206
-rw-r--r--libstdc++-v3/ChangeLog4
-rw-r--r--libstdc++-v3/include/bits/atomic_0.h2
2 files changed, 5 insertions, 1 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index e2cfdaf..7de6bce 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,7 @@
+2010-11-02 Jason Merrill <jason@redhat.com>
+
+ * include/bits/atomic_0.h (_ATOMIC_CMPEXCHNG_): Use C-style cast.
+
2010-11-02 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
PR target/45693
diff --git a/libstdc++-v3/include/bits/atomic_0.h b/libstdc++-v3/include/bits/atomic_0.h
index cd73e43..8daf416 100644
--- a/libstdc++-v3/include/bits/atomic_0.h
+++ b/libstdc++-v3/include/bits/atomic_0.h
@@ -98,7 +98,7 @@ namespace __atomic0
__i_type __t = *__p; \
if (*__q == __t) \
{ \
- *__p = const_cast<__i_type>(__v); \
+ *__p = (__i_type)__v; \
__r = true; \
} \
else { *__q = __t; __r = false; } \