diff options
author | David Daney <daney@gcc.gnu.org> | 2007-02-15 17:03:49 +0000 |
---|---|---|
committer | David Daney <daney@gcc.gnu.org> | 2007-02-15 17:03:49 +0000 |
commit | 31429fbc3c70716cb375dc73d1d151ed769d945e (patch) | |
tree | 2875edfd5cea011a2688f3491cb30ce1430fc6b0 /libjava/gnu | |
parent | b697e623a344451a0067735dde0f7ffcdef83b5a (diff) | |
download | gcc-31429fbc3c70716cb375dc73d1d151ed769d945e.zip gcc-31429fbc3c70716cb375dc73d1d151ed769d945e.tar.gz gcc-31429fbc3c70716cb375dc73d1d151ed769d945e.tar.bz2 |
PlainSocketImpl.h: Regenerate.
* gnu/java/net/PlainSocketImpl.h: Regenerate.
* gnu/classpath/jdwp/VMVirtualMachine.h: Same.
* gnu/classpath/jdwp/VMFrame.h: Same.
* java/net/Socket.h: Same.
* java/util/Collections$UnmodifiableMap$UnmodifiableEntrySet.h: Same.
From-SVN: r122006
Diffstat (limited to 'libjava/gnu')
-rw-r--r-- | libjava/gnu/classpath/jdwp/VMFrame.h | 1 | ||||
-rw-r--r-- | libjava/gnu/classpath/jdwp/VMVirtualMachine.h | 61 | ||||
-rw-r--r-- | libjava/gnu/java/net/PlainSocketImpl.h | 5 |
3 files changed, 37 insertions, 30 deletions
diff --git a/libjava/gnu/classpath/jdwp/VMFrame.h b/libjava/gnu/classpath/jdwp/VMFrame.h index 8181f86..8bc7ac6 100644 --- a/libjava/gnu/classpath/jdwp/VMFrame.h +++ b/libjava/gnu/classpath/jdwp/VMFrame.h @@ -33,6 +33,7 @@ public: virtual ::gnu::classpath::jdwp::util::Location * getLocation(); virtual ::java::lang::Object * getValue(jint); virtual void setValue(jint, ::java::lang::Object *); + virtual ::java::lang::Thread * getThread(); virtual ::java::lang::Object * getObject(); virtual jlong getId(); static const jint SIZE = 8; diff --git a/libjava/gnu/classpath/jdwp/VMVirtualMachine.h b/libjava/gnu/classpath/jdwp/VMVirtualMachine.h index 456053a..421f46a 100644 --- a/libjava/gnu/classpath/jdwp/VMVirtualMachine.h +++ b/libjava/gnu/classpath/jdwp/VMVirtualMachine.h @@ -1,3 +1,4 @@ + // DO NOT EDIT THIS FILE - it is machine generated -*- c++ -*- #ifndef __gnu_classpath_jdwp_VMVirtualMachine__ @@ -16,17 +17,17 @@ extern "Java" { namespace jdwp { - class VMVirtualMachine; + class VMFrame; + class VMMethod; + class VMVirtualMachine; namespace event { - class EventRequest; + class EventRequest; } namespace util { - class MethodResult; + class MethodResult; } - class VMFrame; - class VMMethod; } } } @@ -34,36 +35,36 @@ extern "Java" class gnu::classpath::jdwp::VMVirtualMachine : public ::java::lang::Object { + public: - VMVirtualMachine (); - static void initialize (); - static void suspendThread (::java::lang::Thread *); - static void suspendAllThreads (); - static void resumeThread (::java::lang::Thread *); - static void resumeAllThreads (); - static jint getSuspendCount (::java::lang::Thread *); - static jint getAllLoadedClassesCount (); - static ::java::util::Iterator *getAllLoadedClasses (); - static jint getClassStatus (::java::lang::Class *); - static JArray< ::gnu::classpath::jdwp::VMMethod *> *getAllClassMethods (::java::lang::Class *); - static ::gnu::classpath::jdwp::VMMethod *getClassMethod (::java::lang::Class *, jlong); - static ::java::util::ArrayList *getFrames (::java::lang::Thread *, jint, jint); - static ::gnu::classpath::jdwp::VMFrame *getFrame (::java::lang::Thread *, jlong); - static jint getFrameCount (::java::lang::Thread *); - static jint getThreadStatus (::java::lang::Thread *); - static ::java::util::ArrayList *getLoadRequests (::java::lang::ClassLoader *); - static ::gnu::classpath::jdwp::util::MethodResult *executeMethod (::java::lang::Object *, ::java::lang::Thread *, ::java::lang::Class *, ::java::lang::reflect::Method *, JArray< ::java::lang::Object *> *, jboolean); - static ::java::lang::String *getSourceFile (::java::lang::Class *); - static void registerEvent (::gnu::classpath::jdwp::event::EventRequest *); - static void unregisterEvent (::gnu::classpath::jdwp::event::EventRequest *); - static void clearEvents (jbyte); + VMVirtualMachine(); + static void initialize(); + static void suspendThread(::java::lang::Thread *); + static void suspendAllThreads(); + static void resumeThread(::java::lang::Thread *); + static void resumeAllThreads(); + static jint getSuspendCount(::java::lang::Thread *); + static jint getAllLoadedClassesCount(); + static ::java::util::Iterator * getAllLoadedClasses(); + static jint getClassStatus(::java::lang::Class *); + static JArray< ::gnu::classpath::jdwp::VMMethod * > * getAllClassMethods(::java::lang::Class *); + static ::gnu::classpath::jdwp::VMMethod * getClassMethod(::java::lang::Class *, jlong); + static ::java::util::ArrayList * getFrames(::java::lang::Thread *, jint, jint); + static ::gnu::classpath::jdwp::VMFrame * getFrame(::java::lang::Thread *, jlong); + static jint getFrameCount(::java::lang::Thread *); + static jint getThreadStatus(::java::lang::Thread *); + static ::java::util::ArrayList * getLoadRequests(::java::lang::ClassLoader *); + static ::gnu::classpath::jdwp::util::MethodResult * executeMethod(::java::lang::Object *, ::java::lang::Thread *, ::java::lang::Class *, ::java::lang::reflect::Method *, JArray< ::java::lang::Object * > *, jboolean); + static ::java::lang::String * getSourceFile(::java::lang::Class *); + static void registerEvent(::gnu::classpath::jdwp::event::EventRequest *); + static void unregisterEvent(::gnu::classpath::jdwp::event::EventRequest *); + static void clearEvents(jbyte); private: - static ::java::util::Hashtable *_jdwp_suspend_counts; + static ::java::util::Hashtable * _jdwp_suspend_counts; public: // actually package-private static ::java::util::Hashtable * _stepping_threads; public: - static ::java::lang::Class class$; }; -#endif /* __gnu_classpath_jdwp_VMVirtualMachine__ */ +#endif // __gnu_classpath_jdwp_VMVirtualMachine__ diff --git a/libjava/gnu/java/net/PlainSocketImpl.h b/libjava/gnu/java/net/PlainSocketImpl.h index 7f13ea6..7872ac2 100644 --- a/libjava/gnu/java/net/PlainSocketImpl.h +++ b/libjava/gnu/java/net/PlainSocketImpl.h @@ -24,6 +24,7 @@ extern "Java" namespace net { class InetAddress; + class InetSocketAddress; class SocketAddress; class SocketImpl; } @@ -59,6 +60,9 @@ public: // actually protected jint available(); void close(); void sendUrgentData(jint); +public: + ::java::net::InetSocketAddress * getLocalAddress(); +public: // actually protected ::java::io::InputStream * getInputStream(); ::java::io::OutputStream * getOutputStream(); public: // actually package-private @@ -79,6 +83,7 @@ public: // actually package-private jint __attribute__((aligned(__alignof__( ::java::net::SocketImpl)))) native_fd; jint timeout; ::java::net::InetAddress * localAddress; + ::java::net::InetSocketAddress * localSocketAddress; private: ::java::io::InputStream * in; ::java::io::OutputStream * out; |