From 46dfcc3ee85a4a02abce4d45ee619f240c116af6 Mon Sep 17 00:00:00 2001 From: bstarynk Date: Thu, 25 Aug 2011 19:29:43 +0000 Subject: 2011-08-25 Basile Starynkevitch MELT branch merged with trunk rev 178073 using svnmerge. 2011-08-25 Basile Starynkevitch * gcc/melt-runtime.c (melt_linemap_compute_current_location): Use the linemap_position_for_column function for GCC 4.7 when merging with GCC trunk rev 178073. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@178087 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ada/exp_ch3.ads | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'gcc/ada/exp_ch3.ads') diff --git a/gcc/ada/exp_ch3.ads b/gcc/ada/exp_ch3.ads index beb74b562bb..7b67e23a8cf 100644 --- a/gcc/ada/exp_ch3.ads +++ b/gcc/ada/exp_ch3.ads @@ -6,7 +6,7 @@ -- -- -- S p e c -- -- -- --- Copyright (C) 1992-2010, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2011, Free Software Foundation, Inc. -- -- -- -- GNAT is free software; you can redistribute it and/or modify it under -- -- terms of the GNU General Public License as published by the Free Soft- -- @@ -130,14 +130,14 @@ package Exp_Ch3 is (T : Entity_Id; Consider_IS : Boolean := True) return Boolean; -- Certain types need initialization even though there is no specific - -- initialization routine. In this category are access types (which need - -- initializing to null), packed array types whose implementation is a - -- modular type, and all scalar types if Normalize_Scalars is set, as well - -- as private types whose underlying type is present and meets any of these - -- criteria. Finally, descendants of String and Wide_String also need - -- initialization in Initialize/Normalize_Scalars mode. Consider_IS is - -- normally True. If it is False, the Initialize_Scalars is not considered - -- in determining whether simple initialization is needed. + -- initialization routine: + -- Access types (which need initializing to null) + -- All scalar types if Normalize_Scalars mode set + -- Descendents of standard string types if Normalize_Scalars mode set + -- Scalar types having a Default_Value attribute + -- Regarding Initialize_Scalars mode, this is ignored if Consider_IS is + -- set to False, but if Consider_IS is set to True, then the cases above + -- mentioning Normalize_Scalars also apply for Initialize_Scalars mode. function Get_Simple_Init_Val (T : Entity_Id; -- cgit v1.2.1