Skip to content

Commit

Permalink
Adjust formating, delete duplicate case and correct copyright date
Browse files Browse the repository at this point in the history
Signed-off-by: Dan Heidinga <daniel_heidinga@ca.ibm.com>
  • Loading branch information
DanHeidinga committed May 24, 2019
1 parent cbbe12b commit 68fc46d
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
7 changes: 2 additions & 5 deletions include_core/AtomicSupport.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -394,8 +394,8 @@ class VM_AtomicSupport
}
#endif /* defined(ATOMIC_ALLOW_PRE_READ) */
#if defined(OMRZTPF)
cs((cs_t *)&oldValue, (cs_t *)address, (cs_t)newValue);
return oldValue;
cs((cs_t *)&oldValue, (cs_t *)address, (cs_t)newValue);
return oldValue;
#elif defined(__xlC__) /* defined(OMRZTPF) */
__compare_and_swap((volatile int*)address, (int*)&oldValue, (int)newValue);
return oldValue;
Expand All @@ -410,9 +410,6 @@ class VM_AtomicSupport
/* 390 cs() function defined in <stdlib.h>, doesn't expand properly to __cs1() which correctly deals with aliasing */
__cs1((uint32_t *)&old, (uint32_t *)address, (uint32_t *)&newValue);
return old;
#elif defined(__xlC__) /* defined(J9ZOS390) */
__compare_and_swap((volatile int*)address, (int*)&oldValue, (int)newValue);
return oldValue;
#else /* defined(J9ZOS390) */
#error "lockCompareExchangeU32(): unsupported platform!"
#endif /* defined(__xlC__) */
Expand Down
2 changes: 1 addition & 1 deletion port/unix/omrintrospect.c
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 1991, 2018 IBM Corp. and others
* Copyright (c) 1991, 2019 IBM Corp. and others
*
* This program and the accompanying materials are made available under
* the terms of the Eclipse Public License 2.0 which accompanies this
Expand Down

0 comments on commit 68fc46d

Please sign in to comment.