From e4a1579939ae0d96caffb45978ac382f9d4443ce Mon Sep 17 00:00:00 2001 From: tromey Date: Mon, 5 Mar 2007 14:29:47 +0000 Subject: [PATCH] Updating header files. Earlier change here seems to have been in error. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@122550 138bc75d-0d04-0410-961f-82ee72b054a4 --- .../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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 * 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 aaa2a7ae10d4..55d06e8698f3 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 60fee41a4d02..af69ba60a4e9 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 281690e36fb8..512bc0e07369 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 c71b25bd327b..629cff881e92 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 1b94c3590712..c9d5d890d1cc 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 4d42f54688a4..be9beb80ca9d 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 5e1087b76114..4bd3890eac80 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 5ed4d252a900..5a0993e2656b 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 18808697181b..edaa1cad7bd9 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 36d1f654a64c..1cf8cda9db84 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 e01b42074bf0..8e651b36a533 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 07486a9abf88..105c64e66590 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 d1b55c99983c..921c36377f7d 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 77af8cb17f4a..48e22f2a68da 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 b29138fede41..5722c419bf48 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 82ecce492c17..7606ddcfe497 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 18d3f3204a32..a1b5dc3feee3 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 00b9dde7c9fa..b69b1f655993 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 08a6d597e14a..60d22a952ae9 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 286aff1d003c..136a578b5142 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 c70a4e6d8397..0d0c3b00f3ea 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 e8862e8433f8..363fca6ea107 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 423f2a063566..0976920620ff 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 1e95c3d34b88..41f1f7cba883 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 0abbb8fd23a5..cc49550577d0 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 fc2b9df033d8..e50fcef61af2 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 e6c115e29d84..58d48c9e2a8f 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 5d8697b83c51..2b6cc2a134e2 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 0d9dddce85a2..c6e68952cb62 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: -- 2.47.3