From: Thomas Quinot Date: Tue, 10 Sep 2013 14:58:22 +0000 (+0000) Subject: aspects.ads, [...]: Minor reformatting. X-Git-Tag: releases/gcc-4.9.0~4156 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=860917b625a20ed2cc2d72bd86e89717966f6f92;p=thirdparty%2Fgcc.git aspects.ads, [...]: Minor reformatting. 2013-09-10 Thomas Quinot * aspects.ads, sem_ch13.adb: Minor reformatting. * adaint.c (__gnat_set_close_on_exec): Add comment documenting that this routine is shared between OS_Lib and Sockets. From-SVN: r202458 --- diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index bfb9586b5b69..13d2590b1fcb 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,9 @@ +2013-09-10 Thomas Quinot + + * aspects.ads, sem_ch13.adb: Minor reformatting. + * adaint.c (__gnat_set_close_on_exec): Add comment documenting + that this routine is shared between OS_Lib and Sockets. + 2013-09-10 Robert Dewar * exp_prag.adb (Expand_Pragma_Check): Ignore pragma if Is_Ignored set. diff --git a/gcc/ada/adaint.c b/gcc/ada/adaint.c index c4bb7540c52d..850e1fc47b18 100644 --- a/gcc/ada/adaint.c +++ b/gcc/ada/adaint.c @@ -3748,6 +3748,11 @@ get_gcc_version (void) #endif } +/* + * Set Close_On_Exec as indicated. + * Note: this is used for both GNAT.OS_Lib and GNAT.Sockets. + */ + int __gnat_set_close_on_exec (int fd ATTRIBUTE_UNUSED, int close_on_exec_p ATTRIBUTE_UNUSED) diff --git a/gcc/ada/aspects.ads b/gcc/ada/aspects.ads index a7429d79119d..acaa4cc8cabb 100644 --- a/gcc/ada/aspects.ads +++ b/gcc/ada/aspects.ads @@ -499,8 +499,8 @@ package Aspects is -- To deal with the delayed aspect case, we use two flags. The first is -- set on the parent type if it has delayed representation aspects. This -- flag Has_Delayed_Rep_Aspects indicates that if we derive from this type - -- we have to worry about making sure we inherit any delayed types. The - -- second flag is set on a derived type. May_Have_Inherited_Rep_Aspects + -- we have to worry about making sure we inherit any delayed aspects. The + -- second flag is set on a derived type: May_Have_Inherited_Rep_Aspects -- is set if the parent type has Has_Delayed_Rep_Aspects set. -- When we freeze a derived type, if the May_Have_Inherited_Rep_Aspects @@ -517,17 +517,17 @@ package Aspects is -- is always delayed, as required by the language definition. Never_Delay, - -- There are two cases. There are language defined attributes like - -- Convention where the "expression" is simply an uninterprted + -- There are two cases. There are language defined aspects like + -- Convention where the "expression" is simply an uninterpreted -- identifier, and there is no issue of evaluating it and thus no -- issue of delaying the evaluation. The second case is implementation - -- defined attributes where we have decided that we don't want to - -- allow delays (and for our own attributes we can do what we like!) + -- defined aspects where we have decided that we don't want to allow + -- delays (and for our own aspects we can do what we like!). Rep_Aspect); -- These are the cases of representation aspects that are in general -- delayed, and where there is a potential issue of derived types that - -- inherit delayed representation values + -- inherit delayed representation values. -- Note: even if this table indicates that an aspect is delayed, we never -- delay Boolean aspects that have a missing expression (taken as True), diff --git a/gcc/ada/sem_ch13.adb b/gcc/ada/sem_ch13.adb index 6738a5bfbbd8..edaf8e7e7cee 100644 --- a/gcc/ada/sem_ch13.adb +++ b/gcc/ada/sem_ch13.adb @@ -713,7 +713,7 @@ package body Sem_Ch13 is -- here), and then the flag May_Inherit_Delayed_Rep_Aspects is set in -- the derived type (B here). If this flag is set when the derived type -- is frozen, then this procedure is called to ensure proper inheritance - -- of all delayed aspects from the paren type. The derived type is E, + -- of all delayed aspects from the parent type. The derived type is E, -- the argument to Analyze_Aspects_At_Freeze_Point. ASN is the first -- aspect specification node in the Rep_Item chain for the parent type.