From 938166feb76002d64dfaf9dcafe7e82f4f88d289 Mon Sep 17 00:00:00 2001
From: gary <gary@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Thu, 18 Jan 2007 11:32:40 +0000
Subject: 2007-01-18  Gary Benson  <gbenson@redhat.com>

	* gnu/java/nio/natVMPipeEcos.cc:
	Renamed from gnu/java/nio/natPipeImplEcos.cc.
	* gnu/java/nio/natVMPipePosix.cc:
	Renamed from gnu/java/nio/natPipeImplPosix.cc.
	* gnu/java/nio/natVMPipeWin32.cc:
	Renamed from gnu/java/nio/natPipeImplWin32.cc.
	* gnu/java/nio/natVMSelectorEcos.cc:
	Renamed from gnu/java/nio/natSelectorImplEcos.cc.
	* gnu/java/nio/natVMSelectorPosix.cc:
	Renamed from gnu/java/nio/natSelectorImplPosix.cc.
	* gnu/java/nio/natVMSelectorWin32.cc:
	Renamed from gnu/java/nio/natSelectorImplWin32.cc.
	* java/io/natVMObjectInputStream.cc:
	Renamed from java/io/natObjectInputStream.cc.
	* java/lang/natVMDouble.cc:
	Renamed from java/lang/natDouble.cc.
	* java/lang/natVMFloat.cc:
	Renamed from java/lang/natFloat.cc.
	* Makefile.am, configure.ac: Reflect the above.
	* Makefile.in, configure: Rebuilt.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@120895 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libjava/java/io/natObjectInputStream.cc   | 70 ------------------------------
 libjava/java/io/natVMObjectInputStream.cc | 71 +++++++++++++++++++++++++++++++
 2 files changed, 71 insertions(+), 70 deletions(-)
 delete mode 100644 libjava/java/io/natObjectInputStream.cc
 create mode 100644 libjava/java/io/natVMObjectInputStream.cc

(limited to 'libjava/java/io')

diff --git a/libjava/java/io/natObjectInputStream.cc b/libjava/java/io/natObjectInputStream.cc
deleted file mode 100644
index 62123965526..00000000000
--- a/libjava/java/io/natObjectInputStream.cc
+++ /dev/null
@@ -1,70 +0,0 @@
-// natObjectInputStream.cc - Native part of VMObjectInputStream class.
-
-/* Copyright (C) 1998, 1999, 2000, 2001, 2005, 2006  Free Software Foundation
-
-   This ObjectInputStream is part of libgcj.
-
-This software is copyrighted work licensed under the terms of the
-Libgcj License.  Please consult the ObjectInputStream "LIBGCJ_LICENSE" for
-details.  */
-
-#include <config.h>
-
-#include <gcj/cni.h>
-#include <jvm.h>
-#include <gcj/method.h>
-
-#include <java/io/VMObjectInputStream.h>
-#include <java/io/IOException.h>
-#include <java/lang/Class.h>
-#include <java/lang/reflect/Modifier.h>
-#include <java/lang/reflect/Method.h>
-#include <java/lang/ArrayIndexOutOfBoundsException.h>
-#include <java/lang/SecurityManager.h>
-#include <java/lang/reflect/Constructor.h>
-#include <java/lang/reflect/Method.h>
-#include <java-stack.h>
-
-#ifdef DEBUG
-#include <java/lang/System.h>
-#include <java/io/PrintStream.h>
-#endif
-
-jobject
-java::io::VMObjectInputStream::allocateObject (jclass klass, jclass,
-  ::java::lang::reflect::Constructor *ctr)
-{
-  jobject obj = NULL;
-  using namespace java::lang::reflect;
-
-  try
-    {
-      JvAssert (klass && ! klass->isArray ());
-      if (klass->isInterface() || Modifier::isAbstract(klass->getModifiers()))
-	obj = NULL;	
-      else
-	{
-	  obj = _Jv_AllocObject (klass);
-	}	
-    }
-  catch (jthrowable t)
-    {
-      return NULL;
-    }
-
-  jmethodID meth = _Jv_FromReflectedConstructor (ctr);
-
-  // This is a bit inefficient, and a bit of a hack, since we don't
-  // actually use the Method and since what is returned isn't
-  // technically a Method.  We can't use Method.invoke as it looks up
-  // the declared method.
-  JArray<jclass> *arg_types
-    = (JArray<jclass> *) JvNewObjectArray (0, &java::lang::Class::class$,
-					   NULL);
-
-  // We lie about this being a constructor.  If we put `true' here
-  // then _Jv_CallAnyMethodA would try to allocate the object for us.
-  _Jv_CallAnyMethodA (obj, JvPrimClass (void), meth, false, arg_types, NULL);
-
-  return obj;
-}
diff --git a/libjava/java/io/natVMObjectInputStream.cc b/libjava/java/io/natVMObjectInputStream.cc
new file mode 100644
index 00000000000..86410a4e76b
--- /dev/null
+++ b/libjava/java/io/natVMObjectInputStream.cc
@@ -0,0 +1,71 @@
+// natVMObjectInputStream.cc - Native part of VMObjectInputStream class.
+
+/* Copyright (C) 1998, 1999, 2000, 2001, 2005, 2006, 2007
+   Free Software Foundation
+
+   This file is part of libgcj.
+
+This software is copyrighted work licensed under the terms of the
+Libgcj License.  Please consult the ObjectInputStream "LIBGCJ_LICENSE" for
+details.  */
+
+#include <config.h>
+
+#include <gcj/cni.h>
+#include <jvm.h>
+#include <gcj/method.h>
+
+#include <java/io/VMObjectInputStream.h>
+#include <java/io/IOException.h>
+#include <java/lang/Class.h>
+#include <java/lang/reflect/Modifier.h>
+#include <java/lang/reflect/Method.h>
+#include <java/lang/ArrayIndexOutOfBoundsException.h>
+#include <java/lang/SecurityManager.h>
+#include <java/lang/reflect/Constructor.h>
+#include <java/lang/reflect/Method.h>
+#include <java-stack.h>
+
+#ifdef DEBUG
+#include <java/lang/System.h>
+#include <java/io/PrintStream.h>
+#endif
+
+jobject
+java::io::VMObjectInputStream::allocateObject (jclass klass, jclass,
+  ::java::lang::reflect::Constructor *ctr)
+{
+  jobject obj = NULL;
+  using namespace java::lang::reflect;
+
+  try
+    {
+      JvAssert (klass && ! klass->isArray ());
+      if (klass->isInterface() || Modifier::isAbstract(klass->getModifiers()))
+	obj = NULL;	
+      else
+	{
+	  obj = _Jv_AllocObject (klass);
+	}	
+    }
+  catch (jthrowable t)
+    {
+      return NULL;
+    }
+
+  jmethodID meth = _Jv_FromReflectedConstructor (ctr);
+
+  // This is a bit inefficient, and a bit of a hack, since we don't
+  // actually use the Method and since what is returned isn't
+  // technically a Method.  We can't use Method.invoke as it looks up
+  // the declared method.
+  JArray<jclass> *arg_types
+    = (JArray<jclass> *) JvNewObjectArray (0, &java::lang::Class::class$,
+					   NULL);
+
+  // We lie about this being a constructor.  If we put `true' here
+  // then _Jv_CallAnyMethodA would try to allocate the object for us.
+  _Jv_CallAnyMethodA (obj, JvPrimClass (void), meth, false, arg_types, NULL);
+
+  return obj;
+}
-- 
cgit v1.2.3