From: Viljar Indus <in...@adacore.com> For consitency sake the main and continuation messages should use the same warning characters.
gcc/ada/ * exp_aggr.adb (Expand_Range_Component): Remove extra warning character. Use same conditional warning char. * freeze.adb (Warn_Overlay): Use named warning character. * restrict.adb (Id_Case): Use named warning character. * sem_prag.adb (Rewrite_Assertion_Kind): Use default warning character. Tested on x86_64-pc-linux-gnu, committed on master. --- gcc/ada/exp_aggr.adb | 4 ++-- gcc/ada/freeze.adb | 4 ++-- gcc/ada/restrict.adb | 2 +- gcc/ada/sem_prag.adb | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gcc/ada/exp_aggr.adb b/gcc/ada/exp_aggr.adb index 83b88e7cf73..846665eae20 100644 --- a/gcc/ada/exp_aggr.adb +++ b/gcc/ada/exp_aggr.adb @@ -7276,9 +7276,9 @@ package body Exp_Aggr is Error_Msg_Warn := SPARK_Mode /= On; Error_Msg_N ("!empty aggregate returned by the empty function of a container" - & " aggregate<<<", Parent (N)); + & " aggregate<<", Parent (N)); Error_Msg_N - ("\this will result in infinite recursion??", Parent (N)); + ("\this will result in infinite recursion<<", Parent (N)); end if; --------------------------- diff --git a/gcc/ada/freeze.adb b/gcc/ada/freeze.adb index f7fc895055a..882c026455e 100644 --- a/gcc/ada/freeze.adb +++ b/gcc/ada/freeze.adb @@ -11100,7 +11100,7 @@ package body Freeze is then Error_Msg_NE ("\packed array component& " & - "will be initialized to zero??", + "will be initialized to zero?o?", Nam, Comp); exit; else @@ -11112,7 +11112,7 @@ package body Freeze is Error_Msg_N ("\use pragma Import for & to " & - "suppress initialization (RM B.1(24))??", + "suppress initialization (RM B.1(24))?o?", Nam); end if; end Warn_Overlay; diff --git a/gcc/ada/restrict.adb b/gcc/ada/restrict.adb index bda35d8f441..2e3cdde3d6e 100644 --- a/gcc/ada/restrict.adb +++ b/gcc/ada/restrict.adb @@ -1262,7 +1262,7 @@ package body Restrict is -- Set as warning if warning case if Restriction_Warnings (R) then - Add_Str ("??"); + Add_Str ("?*?"); end if; -- Set main message diff --git a/gcc/ada/sem_prag.adb b/gcc/ada/sem_prag.adb index 87922816a9a..b139bd4cf4e 100644 --- a/gcc/ada/sem_prag.adb +++ b/gcc/ada/sem_prag.adb @@ -33719,7 +33719,7 @@ package body Sem_Prag is Error_Msg_N ("Check_Policy is a non-standard pragma??", N); Error_Msg_N ("\use Assertion_Policy and aspect names Pre/Post for " - & "Ada2012 conformance?", N); + & "Ada2012 conformance??", N); end if; return; -- 2.45.2