diff options
| author | Arnaud Charlet <charlet@adacore.com> | 2018-06-11 09:17:35 +0000 |
|---|---|---|
| committer | Pierre-Marie de Rodat <pmderodat@gcc.gnu.org> | 2018-06-11 09:17:35 +0000 |
| commit | a8c316b2a138983d5d0e7204d142f4363ddb79dd (patch) | |
| tree | 14a210eb275522ca984e0b100b675072446c26cd | |
| parent | 7ffe26fcf5c0ee0b4a6b3878859941fb534c9400 (diff) | |
| download | gcc-a8c316b2a138983d5d0e7204d142f4363ddb79dd.zip gcc-a8c316b2a138983d5d0e7204d142f4363ddb79dd.tar.gz gcc-a8c316b2a138983d5d0e7204d142f4363ddb79dd.tar.bz2 | |
[Ada] Memtrack: have only one definition of fwrite
2018-06-11 Arnaud Charlet <charlet@adacore.com>
gcc/ada/
* libgnat/memtrack.adb (fwrite): Remove second definition.
From-SVN: r261407
| -rw-r--r-- | gcc/ada/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/ada/libgnat/memtrack.adb | 16 |
2 files changed, 11 insertions, 9 deletions
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 1946e54..791942d 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,7 @@ +2018-06-11 Arnaud Charlet <charlet@adacore.com> + + * libgnat/memtrack.adb (fwrite): Remove second definition. + 2018-06-11 Javier Miranda <miranda@adacore.com> * sinfo.ads (Is_Dynamic_Coextension): Adding documentation. diff --git a/gcc/ada/libgnat/memtrack.adb b/gcc/ada/libgnat/memtrack.adb index efe0fb1..eba05b4 100644 --- a/gcc/ada/libgnat/memtrack.adb +++ b/gcc/ada/libgnat/memtrack.adb @@ -107,12 +107,6 @@ package body System.Memory is Size : size_t; Nmemb : size_t; Stream : File_Ptr); - - procedure fwrite - (Str : String; - Size : size_t; - Nmemb : size_t; - Stream : File_Ptr); pragma Import (C, fwrite); procedure fputc (C : Integer; Stream : File_Ptr); @@ -306,9 +300,13 @@ package body System.Memory is OS_Exit (255); end if; - fwrite ("GMEM DUMP" & ASCII.LF, 10, 1, Gmemfile); - fwrite (Timestamp'Address, Duration'Max_Size_In_Storage_Elements, 1, - Gmemfile); + declare + S : constant String := "GMEM DUMP" & ASCII.LF; + begin + fwrite (S'Address, S'Length, 1, Gmemfile); + fwrite (Timestamp'Address, Duration'Max_Size_In_Storage_Elements, + 1, Gmemfile); + end; end if; end Gmem_Initialize; |