aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUros Bizjak <ubizjak@gmail.com>2016-03-18 16:28:54 +0100
committerUros Bizjak <uros@gcc.gnu.org>2016-03-18 16:28:54 +0100
commit09d8f35943a2c7f921e5e37513db2d5c85e6c69f (patch)
treed3f83505e6972e26f658dd78481749b2ba53ee5a
parentdc28bb68856a8dbf57d024efce707607f28e735f (diff)
downloadgcc-09d8f35943a2c7f921e5e37513db2d5c85e6c69f.zip
gcc-09d8f35943a2c7f921e5e37513db2d5c85e6c69f.tar.gz
gcc-09d8f35943a2c7f921e5e37513db2d5c85e6c69f.tar.bz2
Revert:
2015-07-02 Uros Bizjak <ubizjak@gmail.com> * libsupc++/guard.cc (__test_and_acquire): Use __p after __atomic_load to avoid unused variable warning. (__set_and_release): Use __p after __atomic_store to avoid unused variable warning. From-SVN: r234331
-rw-r--r--libstdc++-v3/ChangeLog10
-rw-r--r--libstdc++-v3/libsupc++/guard.cc2
2 files changed, 10 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 8d5312d..76cc284 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,13 @@
+2016-03-18 Uros Bizjak <ubizjak@gmail.com>
+
+ Revert:
+ 2015-07-02 Uros Bizjak <ubizjak@gmail.com>
+
+ * libsupc++/guard.cc (__test_and_acquire): Use __p after __atomic_load
+ to avoid unused variable warning.
+ (__set_and_release): Use __p after __atomic_store to avoid unused
+ variable warning.
+
2016-02-24 Jonathan Wakely <jwakely@redhat.com>
PR libstdc++/69939
diff --git a/libstdc++-v3/libsupc++/guard.cc b/libstdc++-v3/libsupc++/guard.cc
index 9b61799..1b1b23c 100644
--- a/libstdc++-v3/libsupc++/guard.cc
+++ b/libstdc++-v3/libsupc++/guard.cc
@@ -117,7 +117,6 @@ __test_and_acquire (__cxxabiv1::__guard *g)
unsigned char __c;
unsigned char *__p = reinterpret_cast<unsigned char *>(g);
__atomic_load (__p, &__c, __ATOMIC_ACQUIRE);
- (void) __p;
return _GLIBCXX_GUARD_TEST(&__c);
}
# define _GLIBCXX_GUARD_TEST_AND_ACQUIRE(G) __test_and_acquire (G)
@@ -133,7 +132,6 @@ __set_and_release (__cxxabiv1::__guard *g)
unsigned char *__p = reinterpret_cast<unsigned char *>(g);
unsigned char val = 1;
__atomic_store (__p, &val, __ATOMIC_RELEASE);
- (void) __p;
}
# define _GLIBCXX_GUARD_SET_AND_RELEASE(G) __set_and_release (G)
# endif