diff options
author | Tobias Burnus <burnus@net-b.de> | 2007-03-15 08:12:25 +0000 |
---|---|---|
committer | Tobias Burnus <burnus@net-b.de> | 2007-03-15 08:12:25 +0000 |
commit | e90b45fee71a78e072eabb296b36e1f1ff7d6a67 (patch) | |
tree | ae133bd8911b630f65909e29d1ba78aa9b8d3e6a /libjava/java/util/concurrent/SynchronousQueue$TransferQueue.h | |
parent | 7eac6f81591ab7181f3877b847ca21e83aa146b2 (diff) |
Merged Rev. 122210-122935 from the trunk.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/fortran-experiments@122946 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/util/concurrent/SynchronousQueue$TransferQueue.h')
-rw-r--r-- | libjava/java/util/concurrent/SynchronousQueue$TransferQueue.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libjava/java/util/concurrent/SynchronousQueue$TransferQueue.h b/libjava/java/util/concurrent/SynchronousQueue$TransferQueue.h index d1b55c99983..921c36377f7 100644 --- a/libjava/java/util/concurrent/SynchronousQueue$TransferQueue.h +++ b/libjava/java/util/concurrent/SynchronousQueue$TransferQueue.h @@ -19,9 +19,9 @@ public: // actually package-private ::java::lang::Object * transfer(::java::lang::Object *, jboolean, jlong); ::java::lang::Object * awaitFulfill(::java::util::concurrent::SynchronousQueue$TransferQueue$QNode *, ::java::lang::Object *, jboolean, jlong); void clean(::java::util::concurrent::SynchronousQueue$TransferQueue$QNode *, ::java::util::concurrent::SynchronousQueue$TransferQueue$QNode *); - volatile ::java::util::concurrent::SynchronousQueue$TransferQueue$QNode * __attribute__((aligned(__alignof__( ::java::util::concurrent::SynchronousQueue$Transferer)))) head; - volatile ::java::util::concurrent::SynchronousQueue$TransferQueue$QNode * tail; - volatile ::java::util::concurrent::SynchronousQueue$TransferQueue$QNode * cleanMe; + ::java::util::concurrent::SynchronousQueue$TransferQueue$QNode * volatile __attribute__((aligned(__alignof__( ::java::util::concurrent::SynchronousQueue$Transferer)))) head; + ::java::util::concurrent::SynchronousQueue$TransferQueue$QNode * volatile tail; + ::java::util::concurrent::SynchronousQueue$TransferQueue$QNode * volatile cleanMe; static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * headUpdater; static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * tailUpdater; static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * cleanMeUpdater; |