[COMMITTED,30/31] ada: Adjust pragma obsolescent message

Message ID 20250107125350.619654-30-poulhies@adacore.com
State New
Headers
Series [COMMITTED,01/31] ada: Restrict previous change made to expansion of allocators |

Commit Message

Marc Poulhiès Jan. 7, 2025, 12:53 p.m. UTC
  Do not mention an explicit version.

gcc/ada/ChangeLog:

	* libgnat/a-calcon.ads: Adjust.
	* libgnat/a-calend.ads: Adjust.

Tested on x86_64-pc-linux-gnu, committed on master.

---
 gcc/ada/libgnat/a-calcon.ads | 16 ++++++++++++----
 gcc/ada/libgnat/a-calend.ads | 14 ++++++++++----
 2 files changed, 22 insertions(+), 8 deletions(-)
  

Patch

diff --git a/gcc/ada/libgnat/a-calcon.ads b/gcc/ada/libgnat/a-calcon.ads
index a7be1f7f3fd..a94d5c63dff 100644
--- a/gcc/ada/libgnat/a-calcon.ads
+++ b/gcc/ada/libgnat/a-calcon.ads
@@ -37,7 +37,8 @@  with Interfaces.C;
 package Ada.Calendar.Conversions is
 
    function To_Ada_Time (Unix_Time : Interfaces.C.long) return Time;
-   pragma Obsolescent (To_Ada_Time, "Retires in v26");
+   pragma Obsolescent
+     (To_Ada_Time, "This function may be removed in a future version");
    --  Old version which will overflow at the 2038 Epochalypse
 
    function To_Ada_Time_64 (Unix_Time : Interfaces.C.long_long) return Time;
@@ -74,7 +75,9 @@  package Ada.Calendar.Conversions is
    function To_Duration
      (tv_sec  : Interfaces.C.long;
       tv_nsec : Interfaces.C.long) return Duration;
-   pragma Obsolescent (To_Duration, "Retires in v26");
+   pragma
+     Obsolescent
+       (To_Duration, "This function may be removed in a future version");
    --  Old version which will overflow at the 2038 Epochalypse
 
    function To_Duration_64
@@ -90,7 +93,10 @@  package Ada.Calendar.Conversions is
      (D       : Duration;
       tv_sec  : out Interfaces.C.long;
       tv_nsec : out Interfaces.C.long);
-   pragma Obsolescent (To_Struct_Timespec, "Retires in v26");
+   pragma
+     Obsolescent
+       (To_Struct_Timespec,
+        "This function may be removed in a future version");
    --  Old version which will overflow at the 2038 Epochalypse
 
    procedure To_Struct_Timespec_64
@@ -122,7 +128,9 @@  package Ada.Calendar.Conversions is
    --  The input date is considered to be in UTC
 
    function To_Unix_Time (Ada_Time : Time) return Interfaces.C.long;
-   pragma Obsolescent (To_Unix_Time, "Retires in v26");
+   pragma
+     Obsolescent
+       (To_Unix_Time, "This function may be removed in a future version");
    --  Old version which will overflow at the 2038 Epochalypse
 
    function To_Unix_Time_64 (Ada_Time : Time) return Interfaces.C.long_long;
diff --git a/gcc/ada/libgnat/a-calend.ads b/gcc/ada/libgnat/a-calend.ads
index 64907455896..032fad8294f 100644
--- a/gcc/ada/libgnat/a-calend.ads
+++ b/gcc/ada/libgnat/a-calend.ads
@@ -291,7 +291,8 @@  private
    package Conversion_Operations is
 
       function To_Ada_Time (Unix_Time : Long_Integer) return Time;
-      pragma Obsolescent (To_Ada_Time, "Retires in v26");
+      pragma Obsolescent
+        (To_Ada_Time, "This function may be removed in a future version");
       --  Old Unix to Ada Epoch conversion
 
       function To_Ada_Time_64 (Unix_Time : Long_Long_Integer) return Time;
@@ -310,7 +311,8 @@  private
       function To_Duration
         (tv_sec  : Long_Integer;
          tv_nsec : Long_Integer) return Duration;
-      pragma Obsolescent (To_Duration, "Retires in v26");
+      pragma Obsolescent
+        (To_Duration, "This function may be removed in a future version");
       --  Old Struct timespec to Duration conversion
 
       function To_Duration_64
@@ -322,7 +324,10 @@  private
         (D       : Duration;
          tv_sec  : out Long_Integer;
          tv_nsec : out Long_Integer);
-      pragma Obsolescent (To_Struct_Timespec, "Retires in v26");
+      pragma
+        Obsolescent
+          (To_Struct_Timespec,
+           "This function may be removed in a future version");
       --  Old Duration to struct timespec conversion
 
       procedure To_Struct_Timespec_64
@@ -342,7 +347,8 @@  private
       --  Time to struct tm conversion
 
       function To_Unix_Time (Ada_Time : Time) return Long_Integer;
-      pragma Obsolescent (To_Unix_Time, "Retires in v26");
+      pragma Obsolescent
+        (To_Unix_Time, "This function may be removed in a future version");
       --  Old Ada to Unix Epoch conversion
 
       function To_Unix_Time_64 (Ada_Time : Time) return Long_Long_Integer;