Updated Branches:
  refs/heads/master c406a2f49 -> 80dde6dbd

TS-1385 Make it compile on ARM, thanks James


Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/80dde6db
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/80dde6db
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/80dde6db

Branch: refs/heads/master
Commit: 80dde6dbd1307c6fa78136720fc6b4639074e7f1
Parents: c406a2f
Author: Leif Hedstrom <[email protected]>
Authored: Wed Aug 8 12:10:11 2012 -0600
Committer: Leif Hedstrom <[email protected]>
Committed: Wed Aug 8 12:10:11 2012 -0600

----------------------------------------------------------------------
 lib/ts/ink_atomic.h |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/trafficserver/blob/80dde6db/lib/ts/ink_atomic.h
----------------------------------------------------------------------
diff --git a/lib/ts/ink_atomic.h b/lib/ts/ink_atomic.h
index 3d3f8b2..effe64e 100644
--- a/lib/ts/ink_atomic.h
+++ b/lib/ts/ink_atomic.h
@@ -128,7 +128,7 @@ ink_atomic_increment(volatile Type * mem, Amount count) {
 extern ProcessMutex __global_death;
 
 template<>
-static inline int64_t
+inline int64_t
 ink_atomic_swap<int64_t>(pvint64 mem, int64_t value) {
   int64_t old;
   ink_mutex_acquire(&__global_death);
@@ -139,7 +139,7 @@ ink_atomic_swap<int64_t>(pvint64 mem, int64_t value) {
 }
 
 template<>
-static inline int64_t
+inline bool
 ink_atomic_cas<int64_t>(pvint64 mem, int64_t old, int64_t new_value) {
   int64_t curr;
   ink_mutex_acquire(&__global_death);
@@ -151,7 +151,7 @@ ink_atomic_cas<int64_t>(pvint64 mem, int64_t old, int64_t 
new_value) {
 }
 
 template<>
-static inline int64_t
+inline int64_t
 ink_atomic_increment<int64_t>(pvint64 mem, int64_t value) {
   int64_t curr;
   ink_mutex_acquire(&__global_death);

Reply via email to