diff options
author | alkondratenko@gmail.com <alkondratenko@gmail.com@6b5cf1ce-ec42-a296-1ba9-69fdba395a50> | 2013-07-30 08:29:46 +0000 |
---|---|---|
committer | alkondratenko@gmail.com <alkondratenko@gmail.com@6b5cf1ce-ec42-a296-1ba9-69fdba395a50> | 2013-07-30 08:29:46 +0000 |
commit | 1af20041bf5821167e69bf905596b2d45d1d94da (patch) | |
tree | 79a28d7428fbc867900c052df8f464564f305deb | |
parent | 7a9c4e075fe2572307cddd11bc2f5c7d6b3d29ee (diff) | |
download | gperftools-1af20041bf5821167e69bf905596b2d45d1d94da.tar.gz |
issue-559: AtomicWord xxx_AtomicExchange are all inline
Otherwise OSX correctly complains about duplicate definitions
git-svn-id: http://gperftools.googlecode.com/svn/trunk@233 6b5cf1ce-ec42-a296-1ba9-69fdba395a50
-rw-r--r-- | src/base/atomicops.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/base/atomicops.h b/src/base/atomicops.h index fc8fdc5..44d132c 100644 --- a/src/base/atomicops.h +++ b/src/base/atomicops.h @@ -159,14 +159,14 @@ inline AtomicWord NoBarrier_AtomicExchange(volatile AtomicWord* ptr, reinterpret_cast<volatile AtomicWordCastType*>(ptr), new_value); } -AtomicWord Acquire_AtomicExchange(volatile AtomicWord* ptr, - AtomicWord new_value) { +inline AtomicWord Acquire_AtomicExchange(volatile AtomicWord* ptr, + AtomicWord new_value) { return Acquire_AtomicExchange( reinterpret_cast<volatile AtomicWordCastType*>(ptr), new_value); } -AtomicWord Release_AtomicExchange(volatile AtomicWord* ptr, - AtomicWord new_value) { +inline AtomicWord Release_AtomicExchange(volatile AtomicWord* ptr, + AtomicWord new_value) { return Release_AtomicExchange( reinterpret_cast<volatile AtomicWordCastType*>(ptr), new_value); } |