From 3cf0c3c57ebaf07ec2c49a6b438956d03bac3f71 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Mon, 5 Mar 2007 14:29:47 +0000 Subject: [PATCH] Updating header files. Earlier change here seems to have been in error. From-SVN: r122550 --- .../classpath/lib/java/util/TimeZone.class | Bin 31309 -> 31288 bytes libjava/gnu/awt/xlib/XEventLoop.h | 2 +- libjava/gnu/java/awt/peer/gtk/GThreadMutex.h | 2 +- .../ConnectionRunnerPool$ConnectionRunner.h | 2 +- .../rmi/server/UnicastConnectionManager.h | 2 +- libjava/java/lang/SecurityManager.h | 2 +- libjava/java/lang/Thread.h | 2 +- .../java/security/VMSecureRandom$Spinner.h | 4 ++-- .../concurrent/ConcurrentHashMap$HashEntry.h | 2 +- .../concurrent/ConcurrentHashMap$Segment.h | 4 ++-- .../concurrent/ConcurrentLinkedQueue$Node.h | 4 ++-- .../util/concurrent/ConcurrentLinkedQueue.h | 4 ++-- .../concurrent/ConcurrentSkipListMap$Index.h | 2 +- .../concurrent/ConcurrentSkipListMap$Node.h | 4 ++-- .../util/concurrent/ConcurrentSkipListMap.h | 2 +- libjava/java/util/concurrent/Exchanger$Node.h | 2 +- libjava/java/util/concurrent/Exchanger.h | 2 +- .../java/util/concurrent/FutureTask$Sync.h | 2 +- .../concurrent/LinkedBlockingQueue$Node.h | 2 +- .../concurrent/ScheduledThreadPoolExecutor.h | 4 ++-- .../SynchronousQueue$TransferQueue$QNode.h | 6 +++--- .../SynchronousQueue$TransferQueue.h | 6 +++--- .../SynchronousQueue$TransferStack$SNode.h | 6 +++--- .../SynchronousQueue$TransferStack.h | 2 +- .../java/util/concurrent/SynchronousQueue.h | 2 +- .../concurrent/ThreadPoolExecutor$Worker.h | 2 +- .../java/util/concurrent/ThreadPoolExecutor.h | 16 ++++++++-------- .../util/concurrent/atomic/AtomicBoolean.h | 2 +- .../util/concurrent/atomic/AtomicInteger.h | 2 +- .../java/util/concurrent/atomic/AtomicLong.h | 2 +- .../util/concurrent/atomic/AtomicReference.h | 2 +- .../AbstractQueuedLongSynchronizer$Node.h | 8 ++++---- .../locks/AbstractQueuedLongSynchronizer.h | 6 +++--- .../locks/AbstractQueuedSynchronizer$Node.h | 8 ++++---- .../locks/AbstractQueuedSynchronizer.h | 6 +++--- libjava/java/util/logging/ErrorManager.h | 2 +- .../javax/swing/plaf/basic/BasicSpinnerUI$2.h | 2 +- .../javax/swing/plaf/basic/BasicSpinnerUI$4.h | 2 +- 38 files changed, 66 insertions(+), 66 deletions(-) diff --git a/libjava/classpath/lib/java/util/TimeZone.class b/libjava/classpath/lib/java/util/TimeZone.class index 156838091fb5f1d08e751d6a0cdf278c037ec8a6..f8550d3bbb1aa3b66e2a4e3cbfcc341daad82fc3 100644 GIT binary patch delta 3315 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 diff --git a/libjava/gnu/awt/xlib/XEventLoop.h b/libjava/gnu/awt/xlib/XEventLoop.h index 0827f8aaa9a..8061e9a9441 100644 --- a/libjava/gnu/awt/xlib/XEventLoop.h +++ b/libjava/gnu/awt/xlib/XEventLoop.h @@ -67,7 +67,7 @@ private: ::java::lang::Thread * eventLoopThread; public: // actually package-private ::gnu::awt::LightweightRedirector * lightweightRedirector; - volatile jboolean idle; + jboolean volatile idle; public: static ::java::lang::Class class$; }; diff --git a/libjava/gnu/java/awt/peer/gtk/GThreadMutex.h b/libjava/gnu/java/awt/peer/gtk/GThreadMutex.h index 9380a5dda27..c788e827531 100644 --- a/libjava/gnu/java/awt/peer/gtk/GThreadMutex.h +++ b/libjava/gnu/java/awt/peer/gtk/GThreadMutex.h @@ -32,7 +32,7 @@ class gnu::java::awt::peer::gtk::GThreadMutex : public ::java::lang::Object public: // actually package-private GThreadMutex(); - volatile jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) potentialLockers; + jint volatile __attribute__((aligned(__alignof__( ::java::lang::Object)))) potentialLockers; ::java::lang::Object * lockForPotentialLockers; public: static ::java::lang::Class class$; diff --git a/libjava/gnu/java/rmi/server/ConnectionRunnerPool$ConnectionRunner.h b/libjava/gnu/java/rmi/server/ConnectionRunnerPool$ConnectionRunner.h index 9b98afc9e13..664fc4e121c 100644 --- a/libjava/gnu/java/rmi/server/ConnectionRunnerPool$ConnectionRunner.h +++ b/libjava/gnu/java/rmi/server/ConnectionRunnerPool$ConnectionRunner.h @@ -36,7 +36,7 @@ public: // actually package-private virtual void exit(); private: ::gnu::java::rmi::server::UnicastConnection * __attribute__((aligned(__alignof__( ::java::lang::Thread)))) conn; - volatile jboolean exiting; + jboolean volatile exiting; public: static ::java::lang::Class class$; }; diff --git a/libjava/gnu/java/rmi/server/UnicastConnectionManager.h b/libjava/gnu/java/rmi/server/UnicastConnectionManager.h index dd6b828317d..26c19ccc2ba 100644 --- a/libjava/gnu/java/rmi/server/UnicastConnectionManager.h +++ b/libjava/gnu/java/rmi/server/UnicastConnectionManager.h @@ -70,7 +70,7 @@ public: // actually package-private static ::java::util::Hashtable * clients; ::java::util::ArrayList * __attribute__((aligned(__alignof__( ::java::lang::Object)))) connections; private: - volatile ::java::lang::Thread * serverThread; + ::java::lang::Thread * volatile serverThread; ::java::net::ServerSocket * ssock; public: // actually package-private ::java::lang::String * serverName; diff --git a/libjava/java/lang/SecurityManager.h b/libjava/java/lang/SecurityManager.h index 28ef484c3ce..8abaa6a7e08 100644 --- a/libjava/java/lang/SecurityManager.h +++ b/libjava/java/lang/SecurityManager.h @@ -74,7 +74,7 @@ public: virtual ::java::lang::ThreadGroup * getThreadGroup(); public: // actually package-private virtual void checkPackageList(::java::lang::String *, ::java::lang::String *, ::java::lang::String *); - static volatile ::java::lang::SecurityManager * current; + static ::java::lang::SecurityManager * volatile current; public: // actually protected jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) inCheck; public: diff --git a/libjava/java/lang/Thread.h b/libjava/java/lang/Thread.h index e9cf9216100..b9116b1aad2 100644 --- a/libjava/java/lang/Thread.h +++ b/libjava/java/lang/Thread.h @@ -147,7 +147,7 @@ public: // actually package-private ::java::lang::Object * accessControlState; ::gnu::gcj::RawData * interp_frame; ::gnu::gcj::RawData * frame; - volatile jint state; + jint volatile state; ::gnu::gcj::RawDataManaged * data; public: static ::java::lang::Class class$; diff --git a/libjava/java/security/VMSecureRandom$Spinner.h b/libjava/java/security/VMSecureRandom$Spinner.h index 32a1e31acdf..0013a3fc8ca 100644 --- a/libjava/java/security/VMSecureRandom$Spinner.h +++ b/libjava/java/security/VMSecureRandom$Spinner.h @@ -29,8 +29,8 @@ private: void stop(); public: // actually package-private static void access$0(::java::security::VMSecureRandom$Spinner *); - volatile jbyte __attribute__((aligned(__alignof__( ::java::lang::Object)))) value; - volatile jboolean running; + jbyte volatile __attribute__((aligned(__alignof__( ::java::lang::Object)))) value; + jboolean volatile running; public: static ::java::lang::Class class$; }; diff --git a/libjava/java/util/concurrent/ConcurrentHashMap$HashEntry.h b/libjava/java/util/concurrent/ConcurrentHashMap$HashEntry.h index 730394d1c23..2667ed07c5b 100644 --- a/libjava/java/util/concurrent/ConcurrentHashMap$HashEntry.h +++ b/libjava/java/util/concurrent/ConcurrentHashMap$HashEntry.h @@ -18,7 +18,7 @@ public: // actually package-private static JArray< ::java::util::concurrent::ConcurrentHashMap$HashEntry * > * newArray(jint); ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) key; jint hash; - volatile ::java::lang::Object * value; + ::java::lang::Object * volatile value; ::java::util::concurrent::ConcurrentHashMap$HashEntry * next; public: static ::java::lang::Class class$; diff --git a/libjava/java/util/concurrent/ConcurrentHashMap$Segment.h b/libjava/java/util/concurrent/ConcurrentHashMap$Segment.h index aaa2a7ae10d..55d06e8698f 100644 --- a/libjava/java/util/concurrent/ConcurrentHashMap$Segment.h +++ b/libjava/java/util/concurrent/ConcurrentHashMap$Segment.h @@ -31,10 +31,10 @@ public: // actually package-private private: static const jlong serialVersionUID = 2249069246763182397LL; public: // actually package-private - volatile jint __attribute__((aligned(__alignof__( ::java::util::concurrent::locks::ReentrantLock)))) count; + jint volatile __attribute__((aligned(__alignof__( ::java::util::concurrent::locks::ReentrantLock)))) count; jint modCount; jint threshold; - volatile JArray< ::java::util::concurrent::ConcurrentHashMap$HashEntry * > * table; + JArray< ::java::util::concurrent::ConcurrentHashMap$HashEntry * > * volatile table; jfloat loadFactor; public: static ::java::lang::Class class$; diff --git a/libjava/java/util/concurrent/ConcurrentLinkedQueue$Node.h b/libjava/java/util/concurrent/ConcurrentLinkedQueue$Node.h index 60fee41a4d0..af69ba60a4e 100644 --- a/libjava/java/util/concurrent/ConcurrentLinkedQueue$Node.h +++ b/libjava/java/util/concurrent/ConcurrentLinkedQueue$Node.h @@ -21,8 +21,8 @@ public: // actually package-private virtual jboolean casNext(::java::util::concurrent::ConcurrentLinkedQueue$Node *, ::java::util::concurrent::ConcurrentLinkedQueue$Node *); virtual void setNext(::java::util::concurrent::ConcurrentLinkedQueue$Node *); private: - volatile ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) item; - volatile ::java::util::concurrent::ConcurrentLinkedQueue$Node * next; + ::java::lang::Object * volatile __attribute__((aligned(__alignof__( ::java::lang::Object)))) item; + ::java::util::concurrent::ConcurrentLinkedQueue$Node * volatile next; static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * nextUpdater; static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * itemUpdater; public: diff --git a/libjava/java/util/concurrent/ConcurrentLinkedQueue.h b/libjava/java/util/concurrent/ConcurrentLinkedQueue.h index 281690e36fb..512bc0e0736 100644 --- a/libjava/java/util/concurrent/ConcurrentLinkedQueue.h +++ b/libjava/java/util/concurrent/ConcurrentLinkedQueue.h @@ -34,8 +34,8 @@ private: static const jlong serialVersionUID = 196745693267521676LL; static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * tailUpdater; static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * headUpdater; - volatile ::java::util::concurrent::ConcurrentLinkedQueue$Node * __attribute__((aligned(__alignof__( ::java::util::AbstractQueue)))) head; - volatile ::java::util::concurrent::ConcurrentLinkedQueue$Node * tail; + ::java::util::concurrent::ConcurrentLinkedQueue$Node * volatile __attribute__((aligned(__alignof__( ::java::util::AbstractQueue)))) head; + ::java::util::concurrent::ConcurrentLinkedQueue$Node * volatile tail; public: static ::java::lang::Class class$; }; diff --git a/libjava/java/util/concurrent/ConcurrentSkipListMap$Index.h b/libjava/java/util/concurrent/ConcurrentSkipListMap$Index.h index c71b25bd327..629cff881e9 100644 --- a/libjava/java/util/concurrent/ConcurrentSkipListMap$Index.h +++ b/libjava/java/util/concurrent/ConcurrentSkipListMap$Index.h @@ -19,7 +19,7 @@ public: // actually package-private virtual jboolean unlink(::java::util::concurrent::ConcurrentSkipListMap$Index *); ::java::util::concurrent::ConcurrentSkipListMap$Node * __attribute__((aligned(__alignof__( ::java::lang::Object)))) node; ::java::util::concurrent::ConcurrentSkipListMap$Index * down; - volatile ::java::util::concurrent::ConcurrentSkipListMap$Index * right; + ::java::util::concurrent::ConcurrentSkipListMap$Index * volatile right; static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * rightUpdater; public: static ::java::lang::Class class$; diff --git a/libjava/java/util/concurrent/ConcurrentSkipListMap$Node.h b/libjava/java/util/concurrent/ConcurrentSkipListMap$Node.h index 1b94c359071..c9d5d890d1c 100644 --- a/libjava/java/util/concurrent/ConcurrentSkipListMap$Node.h +++ b/libjava/java/util/concurrent/ConcurrentSkipListMap$Node.h @@ -23,8 +23,8 @@ public: // actually package-private ::java::lang::Object * getValidValue(); ::java::util::AbstractMap$SimpleImmutableEntry * createSnapshot(); ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) key; - volatile ::java::lang::Object * value; - volatile ::java::util::concurrent::ConcurrentSkipListMap$Node * next; + ::java::lang::Object * volatile value; + ::java::util::concurrent::ConcurrentSkipListMap$Node * volatile next; static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * nextUpdater; static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * valueUpdater; public: diff --git a/libjava/java/util/concurrent/ConcurrentSkipListMap.h b/libjava/java/util/concurrent/ConcurrentSkipListMap.h index 4d42f54688a..be9beb80ca9 100644 --- a/libjava/java/util/concurrent/ConcurrentSkipListMap.h +++ b/libjava/java/util/concurrent/ConcurrentSkipListMap.h @@ -118,7 +118,7 @@ private: static const jlong serialVersionUID = -8627078645895051609LL; static ::java::util::Random * seedGenerator; static ::java::lang::Object * BASE_HEADER; - volatile ::java::util::concurrent::ConcurrentSkipListMap$HeadIndex * __attribute__((aligned(__alignof__( ::java::util::AbstractMap)))) head; + ::java::util::concurrent::ConcurrentSkipListMap$HeadIndex * volatile __attribute__((aligned(__alignof__( ::java::util::AbstractMap)))) head; ::java::util::Comparator * comparator__; jint randomSeed; ::java::util::concurrent::ConcurrentSkipListMap$KeySet * keySet__; diff --git a/libjava/java/util/concurrent/Exchanger$Node.h b/libjava/java/util/concurrent/Exchanger$Node.h index 5e1087b7611..4bd3890eac8 100644 --- a/libjava/java/util/concurrent/Exchanger$Node.h +++ b/libjava/java/util/concurrent/Exchanger$Node.h @@ -14,7 +14,7 @@ class java::util::concurrent::Exchanger$Node : public ::java::util::concurrent:: public: Exchanger$Node(::java::lang::Object *); ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::util::concurrent::atomic::AtomicReference)))) item; - volatile ::java::lang::Thread * waiter; + ::java::lang::Thread * volatile waiter; static ::java::lang::Class class$; }; diff --git a/libjava/java/util/concurrent/Exchanger.h b/libjava/java/util/concurrent/Exchanger.h index 5ed4d252a90..5a0993e2656 100644 --- a/libjava/java/util/concurrent/Exchanger.h +++ b/libjava/java/util/concurrent/Exchanger.h @@ -33,7 +33,7 @@ private: static jint TIMED_SPINS; static ::java::lang::Object * CANCEL; static ::java::lang::Object * NULL_ITEM; - volatile JArray< ::java::util::concurrent::Exchanger$Slot * > * __attribute__((aligned(__alignof__( ::java::lang::Object)))) arena; + JArray< ::java::util::concurrent::Exchanger$Slot * > * volatile __attribute__((aligned(__alignof__( ::java::lang::Object)))) arena; ::java::util::concurrent::atomic::AtomicInteger * max; public: static ::java::lang::Class class$; diff --git a/libjava/java/util/concurrent/FutureTask$Sync.h b/libjava/java/util/concurrent/FutureTask$Sync.h index 18808697181..edaa1cad7bd 100644 --- a/libjava/java/util/concurrent/FutureTask$Sync.h +++ b/libjava/java/util/concurrent/FutureTask$Sync.h @@ -36,7 +36,7 @@ private: ::java::util::concurrent::Callable * __attribute__((aligned(__alignof__( ::java::util::concurrent::locks::AbstractQueuedSynchronizer)))) callable; ::java::lang::Object * result; ::java::lang::Throwable * exception; - volatile ::java::lang::Thread * runner; + ::java::lang::Thread * volatile runner; public: // actually package-private ::java::util::concurrent::FutureTask * this$0; public: diff --git a/libjava/java/util/concurrent/LinkedBlockingQueue$Node.h b/libjava/java/util/concurrent/LinkedBlockingQueue$Node.h index 36d1f654a64..1cf8cda9db8 100644 --- a/libjava/java/util/concurrent/LinkedBlockingQueue$Node.h +++ b/libjava/java/util/concurrent/LinkedBlockingQueue$Node.h @@ -13,7 +13,7 @@ class java::util::concurrent::LinkedBlockingQueue$Node : public ::java::lang::Ob public: // actually package-private LinkedBlockingQueue$Node(::java::lang::Object *); - volatile ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) item; + ::java::lang::Object * volatile __attribute__((aligned(__alignof__( ::java::lang::Object)))) item; ::java::util::concurrent::LinkedBlockingQueue$Node * next; public: static ::java::lang::Class class$; diff --git a/libjava/java/util/concurrent/ScheduledThreadPoolExecutor.h b/libjava/java/util/concurrent/ScheduledThreadPoolExecutor.h index e01b42074bf..8e651b36a53 100644 --- a/libjava/java/util/concurrent/ScheduledThreadPoolExecutor.h +++ b/libjava/java/util/concurrent/ScheduledThreadPoolExecutor.h @@ -45,8 +45,8 @@ public: // actually package-private static ::java::util::concurrent::atomic::AtomicLong * access$0(); static ::java::util::concurrent::BlockingQueue * access$1(::java::util::concurrent::ScheduledThreadPoolExecutor *); private: - volatile jboolean __attribute__((aligned(__alignof__( ::java::util::concurrent::ThreadPoolExecutor)))) continueExistingPeriodicTasksAfterShutdown; - volatile jboolean executeExistingDelayedTasksAfterShutdown; + jboolean volatile __attribute__((aligned(__alignof__( ::java::util::concurrent::ThreadPoolExecutor)))) continueExistingPeriodicTasksAfterShutdown; + jboolean volatile executeExistingDelayedTasksAfterShutdown; static ::java::util::concurrent::atomic::AtomicLong * sequencer; static jlong NANO_ORIGIN; public: diff --git a/libjava/java/util/concurrent/SynchronousQueue$TransferQueue$QNode.h b/libjava/java/util/concurrent/SynchronousQueue$TransferQueue$QNode.h index 07486a9abf8..105c64e6659 100644 --- a/libjava/java/util/concurrent/SynchronousQueue$TransferQueue$QNode.h +++ b/libjava/java/util/concurrent/SynchronousQueue$TransferQueue$QNode.h @@ -18,9 +18,9 @@ public: // actually package-private void tryCancel(::java::lang::Object *); jboolean isCancelled(); jboolean isOffList(); - volatile ::java::util::concurrent::SynchronousQueue$TransferQueue$QNode * __attribute__((aligned(__alignof__( ::java::lang::Object)))) next; - volatile ::java::lang::Object * item; - volatile ::java::lang::Thread * waiter; + ::java::util::concurrent::SynchronousQueue$TransferQueue$QNode * volatile __attribute__((aligned(__alignof__( ::java::lang::Object)))) next; + ::java::lang::Object * volatile item; + ::java::lang::Thread * volatile waiter; jboolean isData; static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * nextUpdater; static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * itemUpdater; 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; diff --git a/libjava/java/util/concurrent/SynchronousQueue$TransferStack$SNode.h b/libjava/java/util/concurrent/SynchronousQueue$TransferStack$SNode.h index 77af8cb17f4..48e22f2a68d 100644 --- a/libjava/java/util/concurrent/SynchronousQueue$TransferStack$SNode.h +++ b/libjava/java/util/concurrent/SynchronousQueue$TransferStack$SNode.h @@ -17,9 +17,9 @@ public: // actually package-private jboolean tryMatch(::java::util::concurrent::SynchronousQueue$TransferStack$SNode *); void tryCancel(); jboolean isCancelled(); - volatile ::java::util::concurrent::SynchronousQueue$TransferStack$SNode * __attribute__((aligned(__alignof__( ::java::lang::Object)))) next; - volatile ::java::util::concurrent::SynchronousQueue$TransferStack$SNode * match; - volatile ::java::lang::Thread * waiter; + ::java::util::concurrent::SynchronousQueue$TransferStack$SNode * volatile __attribute__((aligned(__alignof__( ::java::lang::Object)))) next; + ::java::util::concurrent::SynchronousQueue$TransferStack$SNode * volatile match; + ::java::lang::Thread * volatile waiter; ::java::lang::Object * item; jint mode; static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * nextUpdater; diff --git a/libjava/java/util/concurrent/SynchronousQueue$TransferStack.h b/libjava/java/util/concurrent/SynchronousQueue$TransferStack.h index b29138fede4..5722c419bf4 100644 --- a/libjava/java/util/concurrent/SynchronousQueue$TransferStack.h +++ b/libjava/java/util/concurrent/SynchronousQueue$TransferStack.h @@ -23,7 +23,7 @@ public: // actually package-private static const jint REQUEST = 0; static const jint DATA = 1; static const jint FULFILLING = 2; - volatile ::java::util::concurrent::SynchronousQueue$TransferStack$SNode * __attribute__((aligned(__alignof__( ::java::util::concurrent::SynchronousQueue$Transferer)))) head; + ::java::util::concurrent::SynchronousQueue$TransferStack$SNode * volatile __attribute__((aligned(__alignof__( ::java::util::concurrent::SynchronousQueue$Transferer)))) head; static ::java::util::concurrent::atomic::AtomicReferenceFieldUpdater * headUpdater; public: static ::java::lang::Class class$; diff --git a/libjava/java/util/concurrent/SynchronousQueue.h b/libjava/java/util/concurrent/SynchronousQueue.h index 82ecce492c1..7606ddcfe49 100644 --- a/libjava/java/util/concurrent/SynchronousQueue.h +++ b/libjava/java/util/concurrent/SynchronousQueue.h @@ -47,7 +47,7 @@ public: // actually package-private static jint maxUntimedSpins; static const jlong spinForTimeoutThreshold = 1000LL; private: - volatile ::java::util::concurrent::SynchronousQueue$Transferer * __attribute__((aligned(__alignof__( ::java::util::AbstractQueue)))) transferer; + ::java::util::concurrent::SynchronousQueue$Transferer * volatile __attribute__((aligned(__alignof__( ::java::util::AbstractQueue)))) transferer; ::java::util::concurrent::locks::ReentrantLock * qlock; ::java::util::concurrent::SynchronousQueue$WaitQueue * waitingProducers; ::java::util::concurrent::SynchronousQueue$WaitQueue * waitingConsumers; diff --git a/libjava/java/util/concurrent/ThreadPoolExecutor$Worker.h b/libjava/java/util/concurrent/ThreadPoolExecutor$Worker.h index 18d3f3204a3..a1b5dc3feee 100644 --- a/libjava/java/util/concurrent/ThreadPoolExecutor$Worker.h +++ b/libjava/java/util/concurrent/ThreadPoolExecutor$Worker.h @@ -24,7 +24,7 @@ private: ::java::util::concurrent::locks::ReentrantLock * __attribute__((aligned(__alignof__( ::java::lang::Object)))) runLock; ::java::lang::Runnable * firstTask; public: // actually package-private - volatile jlong completedTasks; + jlong volatile completedTasks; ::java::lang::Thread * thread; ::java::util::concurrent::ThreadPoolExecutor * this$0; public: diff --git a/libjava/java/util/concurrent/ThreadPoolExecutor.h b/libjava/java/util/concurrent/ThreadPoolExecutor.h index 00b9dde7c9f..b69b1f65599 100644 --- a/libjava/java/util/concurrent/ThreadPoolExecutor.h +++ b/libjava/java/util/concurrent/ThreadPoolExecutor.h @@ -71,20 +71,20 @@ private: ::java::util::concurrent::locks::ReentrantLock * mainLock; ::java::util::concurrent::locks::Condition * termination; ::java::util::HashSet * workers; - volatile jlong keepAliveTime; - volatile jboolean allowCoreThreadTimeOut__; - volatile jint corePoolSize; - volatile jint maximumPoolSize; - volatile jint poolSize; + jlong volatile keepAliveTime; + jboolean volatile allowCoreThreadTimeOut__; + jint volatile corePoolSize; + jint volatile maximumPoolSize; + jint volatile poolSize; public: // actually package-private - volatile jint runState; + jint volatile runState; static const jint RUNNING = 0; static const jint SHUTDOWN = 1; static const jint STOP = 2; static const jint TERMINATED = 3; private: - volatile ::java::util::concurrent::RejectedExecutionHandler * handler; - volatile ::java::util::concurrent::ThreadFactory * threadFactory; + ::java::util::concurrent::RejectedExecutionHandler * volatile handler; + ::java::util::concurrent::ThreadFactory * volatile threadFactory; jint largestPoolSize; jlong completedTaskCount; static ::java::util::concurrent::RejectedExecutionHandler * defaultHandler; diff --git a/libjava/java/util/concurrent/atomic/AtomicBoolean.h b/libjava/java/util/concurrent/atomic/AtomicBoolean.h index 08a6d597e14..60d22a952ae 100644 --- a/libjava/java/util/concurrent/atomic/AtomicBoolean.h +++ b/libjava/java/util/concurrent/atomic/AtomicBoolean.h @@ -35,7 +35,7 @@ private: static const jlong serialVersionUID = 4654671469794556979LL; static ::sun::misc::Unsafe * unsafe; static jlong valueOffset; - volatile jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) value; + jint volatile __attribute__((aligned(__alignof__( ::java::lang::Object)))) value; public: static ::java::lang::Class class$; }; diff --git a/libjava/java/util/concurrent/atomic/AtomicInteger.h b/libjava/java/util/concurrent/atomic/AtomicInteger.h index 286aff1d003..136a578b514 100644 --- a/libjava/java/util/concurrent/atomic/AtomicInteger.h +++ b/libjava/java/util/concurrent/atomic/AtomicInteger.h @@ -45,7 +45,7 @@ private: static const jlong serialVersionUID = 6214790243416807050LL; static ::sun::misc::Unsafe * unsafe; static jlong valueOffset; - volatile jint __attribute__((aligned(__alignof__( ::java::lang::Number)))) value; + jint volatile __attribute__((aligned(__alignof__( ::java::lang::Number)))) value; public: static ::java::lang::Class class$; }; diff --git a/libjava/java/util/concurrent/atomic/AtomicLong.h b/libjava/java/util/concurrent/atomic/AtomicLong.h index c70a4e6d839..0d0c3b00f3e 100644 --- a/libjava/java/util/concurrent/atomic/AtomicLong.h +++ b/libjava/java/util/concurrent/atomic/AtomicLong.h @@ -49,7 +49,7 @@ private: public: // actually package-private static jboolean VM_SUPPORTS_LONG_CAS; private: - volatile jlong __attribute__((aligned(__alignof__( ::java::lang::Number)))) value; + jlong volatile __attribute__((aligned(__alignof__( ::java::lang::Number)))) value; public: static ::java::lang::Class class$; }; diff --git a/libjava/java/util/concurrent/atomic/AtomicReference.h b/libjava/java/util/concurrent/atomic/AtomicReference.h index e8862e8433f..363fca6ea10 100644 --- a/libjava/java/util/concurrent/atomic/AtomicReference.h +++ b/libjava/java/util/concurrent/atomic/AtomicReference.h @@ -35,7 +35,7 @@ private: static const jlong serialVersionUID = -1848883965231344442LL; static ::sun::misc::Unsafe * unsafe; static jlong valueOffset; - volatile ::java::lang::Object * __attribute__((aligned(__alignof__( ::java::lang::Object)))) value; + ::java::lang::Object * volatile __attribute__((aligned(__alignof__( ::java::lang::Object)))) value; public: static ::java::lang::Class class$; }; diff --git a/libjava/java/util/concurrent/locks/AbstractQueuedLongSynchronizer$Node.h b/libjava/java/util/concurrent/locks/AbstractQueuedLongSynchronizer$Node.h index 423f2a06356..0976920620f 100644 --- a/libjava/java/util/concurrent/locks/AbstractQueuedLongSynchronizer$Node.h +++ b/libjava/java/util/concurrent/locks/AbstractQueuedLongSynchronizer$Node.h @@ -22,10 +22,10 @@ public: // actually package-private static const jint CONDITION = -2; static ::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node * SHARED; static ::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node * EXCLUSIVE; - volatile jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) waitStatus; - volatile ::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node * prev; - volatile ::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node * next; - volatile ::java::lang::Thread * thread; + jint volatile __attribute__((aligned(__alignof__( ::java::lang::Object)))) waitStatus; + ::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node * volatile prev; + ::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node * volatile next; + ::java::lang::Thread * volatile thread; ::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node * nextWaiter; public: static ::java::lang::Class class$; diff --git a/libjava/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.h b/libjava/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.h index 1e95c3d34b8..41f1f7cba88 100644 --- a/libjava/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.h +++ b/libjava/java/util/concurrent/locks/AbstractQueuedLongSynchronizer.h @@ -97,9 +97,9 @@ public: // actually package-private static void access$0(); private: static const jlong serialVersionUID = 7373984972572414692LL; - volatile ::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node * __attribute__((aligned(__alignof__( ::java::util::concurrent::locks::AbstractOwnableSynchronizer)))) head; - volatile ::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node * tail; - volatile jlong state; + ::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node * volatile __attribute__((aligned(__alignof__( ::java::util::concurrent::locks::AbstractOwnableSynchronizer)))) head; + ::java::util::concurrent::locks::AbstractQueuedLongSynchronizer$Node * volatile tail; + jlong volatile state; public: // actually package-private static const jlong spinForTimeoutThreshold = 1000LL; private: diff --git a/libjava/java/util/concurrent/locks/AbstractQueuedSynchronizer$Node.h b/libjava/java/util/concurrent/locks/AbstractQueuedSynchronizer$Node.h index 0abbb8fd23a..cc49550577d 100644 --- a/libjava/java/util/concurrent/locks/AbstractQueuedSynchronizer$Node.h +++ b/libjava/java/util/concurrent/locks/AbstractQueuedSynchronizer$Node.h @@ -22,10 +22,10 @@ public: // actually package-private static const jint CONDITION = -2; static ::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node * SHARED; static ::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node * EXCLUSIVE; - volatile jint __attribute__((aligned(__alignof__( ::java::lang::Object)))) waitStatus; - volatile ::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node * prev; - volatile ::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node * next; - volatile ::java::lang::Thread * thread; + jint volatile __attribute__((aligned(__alignof__( ::java::lang::Object)))) waitStatus; + ::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node * volatile prev; + ::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node * volatile next; + ::java::lang::Thread * volatile thread; ::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node * nextWaiter; public: static ::java::lang::Class class$; diff --git a/libjava/java/util/concurrent/locks/AbstractQueuedSynchronizer.h b/libjava/java/util/concurrent/locks/AbstractQueuedSynchronizer.h index fc2b9df033d..e50fcef61af 100644 --- a/libjava/java/util/concurrent/locks/AbstractQueuedSynchronizer.h +++ b/libjava/java/util/concurrent/locks/AbstractQueuedSynchronizer.h @@ -97,9 +97,9 @@ public: // actually package-private static void access$0(); private: static const jlong serialVersionUID = 7373984972572414691LL; - volatile ::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node * __attribute__((aligned(__alignof__( ::java::util::concurrent::locks::AbstractOwnableSynchronizer)))) head; - volatile ::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node * tail; - volatile jint state; + ::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node * volatile __attribute__((aligned(__alignof__( ::java::util::concurrent::locks::AbstractOwnableSynchronizer)))) head; + ::java::util::concurrent::locks::AbstractQueuedSynchronizer$Node * volatile tail; + jint volatile state; public: // actually package-private static const jlong spinForTimeoutThreshold = 1000LL; private: diff --git a/libjava/java/util/logging/ErrorManager.h b/libjava/java/util/logging/ErrorManager.h index e6c115e29d8..58d48c9e2a8 100644 --- a/libjava/java/util/logging/ErrorManager.h +++ b/libjava/java/util/logging/ErrorManager.h @@ -21,7 +21,7 @@ public: static const jint OPEN_FAILURE = 4; static const jint FORMAT_FAILURE = 5; private: - volatile jboolean __attribute__((aligned(__alignof__( ::java::lang::Object)))) everUsed; + jboolean volatile __attribute__((aligned(__alignof__( ::java::lang::Object)))) everUsed; public: static ::java::lang::Class class$; }; diff --git a/libjava/javax/swing/plaf/basic/BasicSpinnerUI$2.h b/libjava/javax/swing/plaf/basic/BasicSpinnerUI$2.h index 5d8697b83c5..2b6cc2a134e 100644 --- a/libjava/javax/swing/plaf/basic/BasicSpinnerUI$2.h +++ b/libjava/javax/swing/plaf/basic/BasicSpinnerUI$2.h @@ -46,7 +46,7 @@ public: void mouseReleased(::java::awt::event::MouseEvent *); public: // actually package-private void increment(); - volatile jboolean __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) mouseDown; + jboolean volatile __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) mouseDown; ::javax::swing::Timer * timer; ::javax::swing::plaf::basic::BasicSpinnerUI * this$0; public: diff --git a/libjava/javax/swing/plaf/basic/BasicSpinnerUI$4.h b/libjava/javax/swing/plaf/basic/BasicSpinnerUI$4.h index 0d9dddce85a..c6e68952cb6 100644 --- a/libjava/javax/swing/plaf/basic/BasicSpinnerUI$4.h +++ b/libjava/javax/swing/plaf/basic/BasicSpinnerUI$4.h @@ -46,7 +46,7 @@ public: void mouseReleased(::java::awt::event::MouseEvent *); public: // actually package-private void decrement(); - volatile jboolean __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) mouseDown; + jboolean volatile __attribute__((aligned(__alignof__( ::java::awt::event::MouseAdapter)))) mouseDown; ::javax::swing::Timer * timer; ::javax::swing::plaf::basic::BasicSpinnerUI * this$0; public: