am 0f3fcd12: Merge "Fix atomic_load on const variable in pthread_cond_t."

* commit '0f3fcd12ddde0e10fbeab0a98cf0efb9d64bea76':
  Fix atomic_load on const variable in pthread_cond_t.
This commit is contained in:
Yabin Cui 2015-03-16 21:43:21 +00:00 committed by Android Git Automerger
commit 19631034a4

View File

@ -107,11 +107,11 @@ int pthread_condattr_destroy(pthread_condattr_t* attr) {
struct pthread_cond_internal_t {
atomic_uint state;
bool process_shared() const {
bool process_shared() {
return COND_IS_SHARED(atomic_load_explicit(&state, memory_order_relaxed));
}
int get_clock() const {
int get_clock() {
return COND_GET_CLOCK(atomic_load_explicit(&state, memory_order_relaxed));
}