diff options
| author | Bob Duff <duff@adacore.com> | 2017-09-08 11:38:38 +0200 |
|---|---|---|
| committer | Arnaud Charlet <charlet@gcc.gnu.org> | 2017-09-08 11:38:38 +0200 |
| commit | a481c9b40f0de76bf9e86b9aba7c1fe66cd7add0 (patch) | |
| tree | db151eb9b304d071bf6c6ef4d7a47cbb31b5103b | |
| parent | 1c912574373f58b64bb0eb53560695aaf489bf43 (diff) | |
| download | gcc-a481c9b40f0de76bf9e86b9aba7c1fe66cd7add0.zip gcc-a481c9b40f0de76bf9e86b9aba7c1fe66cd7add0.tar.gz gcc-a481c9b40f0de76bf9e86b9aba7c1fe66cd7add0.tar.bz2 | |
re PR ada/80888 (Wide_Text_IO defaults to bracket encoding even if -gnatW8 specified)
2017-09-08 Bob Duff <duff@adacore.com>
PR ada/80888
* a-textio.adb, a-witeio.adb, a-ztexio.adb (Set_WCEM): Use
Default_WCEM by default (i.e. if the encoding is not specified
by the Form string).
From-SVN: r251874
| -rw-r--r-- | gcc/ada/a-textio.adb | 5 | ||||
| -rw-r--r-- | gcc/ada/a-witeio.adb | 5 | ||||
| -rw-r--r-- | gcc/ada/a-ztexio.adb | 5 |
3 files changed, 6 insertions, 9 deletions
diff --git a/gcc/ada/a-textio.adb b/gcc/ada/a-textio.adb index f9219e3..0f842a0 100644 --- a/gcc/ada/a-textio.adb +++ b/gcc/ada/a-textio.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 1992-2016, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2017, 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- -- @@ -1810,11 +1810,10 @@ package body Ada.Text_IO is Stop : Natural; begin - File.WC_Method := WCEM_Brackets; FIO.Form_Parameter (File.Form.all, "wcem", Start, Stop); if Start = 0 then - File.WC_Method := WCEM_Brackets; + File.WC_Method := Default_WCEM; else if Stop = Start then diff --git a/gcc/ada/a-witeio.adb b/gcc/ada/a-witeio.adb index 59e06e2..aadc5ee 100644 --- a/gcc/ada/a-witeio.adb +++ b/gcc/ada/a-witeio.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 1992-2014, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2017, 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- -- @@ -1652,11 +1652,10 @@ package body Ada.Wide_Text_IO is Stop : Natural; begin - File.WC_Method := WCEM_Brackets; FIO.Form_Parameter (File.Form.all, "wcem", Start, Stop); if Start = 0 then - File.WC_Method := WCEM_Brackets; + File.WC_Method := Default_WCEM; else if Stop = Start then diff --git a/gcc/ada/a-ztexio.adb b/gcc/ada/a-ztexio.adb index 6102942..39fd38a 100644 --- a/gcc/ada/a-ztexio.adb +++ b/gcc/ada/a-ztexio.adb @@ -6,7 +6,7 @@ -- -- -- B o d y -- -- -- --- Copyright (C) 1992-2014, Free Software Foundation, Inc. -- +-- Copyright (C) 1992-2017, 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- -- @@ -1626,11 +1626,10 @@ package body Ada.Wide_Wide_Text_IO is Stop : Natural; begin - File.WC_Method := WCEM_Brackets; FIO.Form_Parameter (File.Form.all, "wcem", Start, Stop); if Start = 0 then - File.WC_Method := WCEM_Brackets; + File.WC_Method := Default_WCEM; else if Stop = Start then |