This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
[BC] Fix bad merge
- From: Andrew Haley <aph at redhat dot com>
- To: Gcc Patch List <gcc-patches at gcc dot gnu dot org>, Java Patch List <java-patches at gcc dot gnu dot org>
- Date: Fri, 29 Oct 2004 10:17:25 +0100
- Subject: [BC] Fix bad merge
2004-10-29 Andrew Haley <aph@redhat.com>
* jcf-parse.c (give_name_to_class): Remove line that was
incorrectly merged.
Index: jcf-parse.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/java/jcf-parse.c,v
retrieving revision 1.158.4.8
diff -u -r1.158.4.8 jcf-parse.c
--- jcf-parse.c 29 Oct 2004 09:14:44 -0000 1.158.4.8
+++ jcf-parse.c 29 Oct 2004 09:14:55 -0000
@@ -459,7 +459,6 @@
}
#else
input_location = DECL_SOURCE_LOCATION (TYPE_NAME (this_class));
- file_start_location = input_location;
if (main_input_filename == NULL && jcf == main_jcf)
main_input_filename = input_filename;
#endif