diff options
author | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-04-19 00:24:09 +0000 |
---|---|---|
committer | tromey <tromey@138bc75d-0d04-0410-961f-82ee72b054a4> | 2007-04-19 00:24:09 +0000 |
commit | ef45a2696c58923d63a7854ea5bc0840ede96047 (patch) | |
tree | e08786d000d7c3bc2119fb775da6d96fbbe84475 /libjava/java/util/concurrent/locks | |
parent | ef09cb43eedbb66a9e9062144a4af825e581ab1a (diff) | |
download | ppe42-gcc-ef45a2696c58923d63a7854ea5bc0840ede96047.tar.gz ppe42-gcc-ef45a2696c58923d63a7854ea5bc0840ede96047.zip |
libjava
* Regenerated headers with new gjavah.
libjava/classpath
* tools/gnu/classpath/tools/javah/MethodHelper.java (print):
Changed arguments. Directly print method name.
* tools/gnu/classpath/tools/javah/ClassWrapper.java
(methodNameMap): New field.
(makeVtable): Initialize it.
(printMethods): Compute name for bridge targets.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@123965 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/java/util/concurrent/locks')
-rw-r--r-- | libjava/java/util/concurrent/locks/ReentrantReadWriteLock$Sync$ThreadLocalHoldCounter.h | 2 | ||||
-rw-r--r-- | libjava/java/util/concurrent/locks/ReentrantReadWriteLock.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libjava/java/util/concurrent/locks/ReentrantReadWriteLock$Sync$ThreadLocalHoldCounter.h b/libjava/java/util/concurrent/locks/ReentrantReadWriteLock$Sync$ThreadLocalHoldCounter.h index c9dedf0df50..10f87c92202 100644 --- a/libjava/java/util/concurrent/locks/ReentrantReadWriteLock$Sync$ThreadLocalHoldCounter.h +++ b/libjava/java/util/concurrent/locks/ReentrantReadWriteLock$Sync$ThreadLocalHoldCounter.h @@ -14,7 +14,7 @@ class java::util::concurrent::locks::ReentrantReadWriteLock$Sync$ThreadLocalHold public: // actually package-private ReentrantReadWriteLock$Sync$ThreadLocalHoldCounter(); public: - ::java::util::concurrent::locks::ReentrantReadWriteLock$Sync$HoldCounter * target$initialValue(); + ::java::util::concurrent::locks::ReentrantReadWriteLock$Sync$HoldCounter * ReentrantReadWriteLock$Sync$ThreadLocalHoldCounter$initialValue(); ::java::lang::Object * initialValue(); static ::java::lang::Class class$; }; diff --git a/libjava/java/util/concurrent/locks/ReentrantReadWriteLock.h b/libjava/java/util/concurrent/locks/ReentrantReadWriteLock.h index 3bea3cc54a1..e7da50a750b 100644 --- a/libjava/java/util/concurrent/locks/ReentrantReadWriteLock.h +++ b/libjava/java/util/concurrent/locks/ReentrantReadWriteLock.h @@ -14,8 +14,8 @@ class java::util::concurrent::locks::ReentrantReadWriteLock : public ::java::lan public: ReentrantReadWriteLock(); ReentrantReadWriteLock(jboolean); - virtual ::java::util::concurrent::locks::ReentrantReadWriteLock$WriteLock * target$writeLock(); - virtual ::java::util::concurrent::locks::ReentrantReadWriteLock$ReadLock * target$readLock(); + virtual ::java::util::concurrent::locks::ReentrantReadWriteLock$WriteLock * ReentrantReadWriteLock$writeLock(); + virtual ::java::util::concurrent::locks::ReentrantReadWriteLock$ReadLock * ReentrantReadWriteLock$readLock(); virtual jboolean isFair(); public: // actually protected virtual ::java::lang::Thread * getOwner(); |