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
2007-02-15 17:03:49 +00:00 · 2007-02-15 17:03:49 +00:00 · 31429fbc3c
commit 31429fbc3c
parent b697e623a3
6 changed files with 60 additions and 48 deletions
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@ -1,24 +1,30 @@
+2007-02-15  David Daney  <ddaney@avtrex.com>
+
+	* 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.
+
 2007-02-15  Kyle Galloway  <kgallowa@redhat.com>

 	* defineclass.cc (_Jv_ClassReader::read_one_code_attribute):
-    Added LocalVariableTable attribute handling.
-    (_Jv_ClassReader::pool_Utf8_to_char_arr): New method.
-    * jvmti.cc (_Jv_JVMTI_GetLocalVariableTable): New method.
-    * include/java-interp.h: Added local_var_table and
-    local_var_table_len fields to _Jv_InterpMethod.
-    (_Jv_InterpMethod::get_local_var_table): New method.
-    * testsuite/libjava.jvmti/interp/getlocalvartable.java: New
-    test.
-    * testsuite/libjava.jvmti/interp/getlocalvartable.jar: New test.
-    * testsuite/libjava.jvmti/interp/getlocalvartable.out: Output
-    for new test.
-    * testsuite/libjava.jvmti/interp/getlocalvartable.h: New test.
-    * testsuite/libjava.jvmti/interp/natgetlocalvartable.cc: New
-    test.
+	Added LocalVariableTable attribute handling.
+	(_Jv_ClassReader::pool_Utf8_to_char_arr): New method.
+	* jvmti.cc (_Jv_JVMTI_GetLocalVariableTable): New method.
+	* include/java-interp.h: Added local_var_table and 
+	local_var_table_len fields to _Jv_InterpMethod.
+	(_Jv_InterpMethod::get_local_var_table): New method.
+	* testsuite/libjava.jvmti/interp/getlocalvartable.java: New test.
+	* testsuite/libjava.jvmti/interp/getlocalvartable.jar: New test.
+	* testsuite/libjava.jvmti/interp/getlocalvartable.out: Output
+	for new test.
+	* testsuite/libjava.jvmti/interp/getlocalvartable.h: New test.
+	* testsuite/libjava.jvmti/interp/natgetlocalvartable.cc: New test.

 2007-02-15  Kyle Galloway  <kgallowa@redhat.com>
- 
-   * gnu/classpath/jdwp/natVMVirtualMachine (getFrames): Implement.
+
+	* gnu/classpath/jdwp/natVMVirtualMachine (getFrames): Implement.

 2007-02-13  Keith Seitz  <keiths@redhat.com>

--- 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;
--- 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__
--- 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;
--- a/libjava/java/net/Socket.h
+++ b/libjava/java/net/Socket.h
@ -91,7 +91,6 @@ public:
 public: // actually package-private
  static ::java::net::SocketImplFactory * factory;
  ::java::net::SocketImpl * __attribute__((aligned(__alignof__( ::java::lang::Object)))) impl;
-  jboolean implCreated;
  jboolean bound;
 private:
  jboolean inputShutdown;
--- a/libjava/java/util/Collections$UnmodifiableMap$UnmodifiableEntrySet.h
+++ b/libjava/java/util/Collections$UnmodifiableMap$UnmodifiableEntrySet.h
@ -18,7 +18,7 @@ public: // actually package-private
 public:
  ::java::util::Iterator * iterator();
  JArray< ::java::util::Map$Entry * > * target$toArray();
-  JArray< ::java::util::Map$Entry * > * toArray(JArray< ::java::util::Map$Entry * > *);
+  JArray< ::java::lang::Object * > * toArray(JArray< ::java::lang::Object * > *);
  JArray< ::java::lang::Object * > * toArray();
 private:
  static const jlong serialVersionUID = 7854390611657943733LL;