Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

The new atomic should only be visible in LP64 to avoid conflict

Change-Id: I9d181a886933ef0fd6e43c318e9f7e5f077acbc0
Reviewed-on: http://review.couchbase.org/14047
Reviewed-by: Trond Norbye <trond.norbye@gmail.com>
Tested-by: Trond Norbye <trond.norbye@gmail.com>
  • Loading branch information...
commit fac6ed277ce37a50361e0c687e446da03a69e0da 1 parent f665623
@trondn trondn authored
Showing with 2 additions and 0 deletions.
  1. +2 −0  atomic/libatomic.h
View
2  atomic/libatomic.h
@@ -125,6 +125,7 @@ inline bool ep_sync_bool_compare_and_swap(volatile int *dest, int prev, int next
}
}
+#ifdef _LP64
inline bool ep_sync_bool_compare_and_swap(volatile unsigned int *dest, unsigned int prev, unsigned int next) {
hrtime_t original = *dest;
if (original == atomic_cas_uint((volatile uint_t*)dest, (uint_t)prev, (uint_t)next)) {
@@ -133,6 +134,7 @@ inline bool ep_sync_bool_compare_and_swap(volatile unsigned int *dest, unsigned
return false;
}
}
+#endif
inline bool ep_sync_bool_compare_and_swap(volatile hrtime_t *dest, hrtime_t prev, hrtime_t next) {
hrtime_t original = *dest;

0 comments on commit fac6ed2

Please sign in to comment.
Something went wrong with that request. Please try again.