From: Arnaud Charlet <charlet@gcc.gnu.org>
Date: Mon, 1 Oct 2012 09:45:13 +0000 (+0200)
Subject: trans.c (gigi): Adjust previous change to avoid a typecast that discards a const... 
X-Git-Tag: misc/gccgo-go1_1_2~528
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fd96b9fccf19247dbf1472ffdf5b7441bfa3aede;p=thirdparty%2Fgcc.git

trans.c (gigi): Adjust previous change to avoid a typecast that discards a const qualifier.

	* gcc-interface/trans.c (gigi): Adjust previous change to avoid a
	typecast that discards a const qualifier.

From-SVN: r191907
---

diff --git a/gcc/ada/gcc-interface/trans.c b/gcc/ada/gcc-interface/trans.c
index 661d9bfd7785..80ee1f830d93 100644
--- a/gcc/ada/gcc-interface/trans.c
+++ b/gcc/ada/gcc-interface/trans.c
@@ -293,7 +293,9 @@ gigi (Node_Id gnat_root, int max_gnat_node, int number_name ATTRIBUTE_UNUSED,
   tree int64_type = gnat_type_for_size (64, 0);
   struct elab_info *info;
   int i;
+#ifdef ORDINARY_MAP_INSTANCE
   struct line_map *map;
+#endif
 
   max_gnat_nodes = max_gnat_node;
 
@@ -326,9 +328,9 @@ gigi (Node_Id gnat_root, int max_gnat_node, int number_name ATTRIBUTE_UNUSED,
 
       /* We create the line map for a source file at once, with a fixed number
 	 of columns chosen to avoid jumping over the next power of 2.  */
-      map = (struct line_map *) linemap_add
-                                  (line_table, LC_ENTER, 0, filename, 1);
+      linemap_add (line_table, LC_ENTER, 0, filename, 1);
 #ifdef ORDINARY_MAP_INSTANCE
+      map = LINEMAPS_ORDINARY_MAP_AT (line_table, i);
       if (flag_debug_instances)
         ORDINARY_MAP_INSTANCE(map) = file_info_ptr[i].Instance;
 #endif