diff options
| author | Arnstein Ressem <aressem@yahoo-inc.com> | 2016-06-16 13:42:50 +0200 |
|---|---|---|
| committer | Arnstein Ressem <aressem@yahoo-inc.com> | 2016-06-16 13:42:50 +0200 |
| commit | 14d0677226e67245f22a4cba506301e9c9dbd779 (patch) | |
| tree | 0271ce23c40ba29fc47bb32b0d130485b0c106dd /vespalib | |
| parent | 476f97dae6dd7310e58e18a26a6973d9295f8815 (diff) | |
| parent | a46f6dcc87f07996fbd32ecc07b4253bd563b840 (diff) | |
Merge branch 'master' into aressem/vespa-compile-on-centos7
Diffstat (limited to 'vespalib')
| -rw-r--r-- | vespalib/src/vespa/vespalib/util/atomic.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/vespalib/src/vespa/vespalib/util/atomic.h b/vespalib/src/vespa/vespalib/util/atomic.h index 77f1f7554ae..c9259671cae 100644 --- a/vespalib/src/vespa/vespalib/util/atomic.h +++ b/vespalib/src/vespa/vespalib/util/atomic.h @@ -67,7 +67,7 @@ public: static inline int64_t postDec(volatile int64_t *data); static inline bool cmpSwap(volatile int64_t * dest, int64_t newVal, int64_t oldVal); -#if defined(FASTOS_64BIT_LONG) +#if defined(__x86_64__) static inline bool cmpSwap(volatile long long * dest, long long newVal, long long oldVal); static inline bool cmpSwap(volatile unsigned long long * dest, unsigned long long newVal, unsigned long long oldVal); #endif @@ -75,8 +75,6 @@ public: #if defined(__x86_64__) #define VESPALIB_ATOMIC_TAGGEDPTR_ALIGNMENT __attribute__ ((aligned (16))) -#elif defined(__i386__) - #define VESPALIB_ATOMIC_TAGGEDPTR_ALIGNMENT #else #error "VESPALIB_ATOMIC_TAGGEDPTR_ALIGNMENT can not be defined." #endif |