[Plplot-cvs] SF.net SVN: plplot:[9251] trunk

[<jb...@us...>]

Revision: 9251
          http://plplot.svn.sourceforge.net/plplot/?rev=9251&view=rev
Author:   jbauck
Date:     2009-01-04 21:46:04 +0000 (Sun, 04 Jan 2009)

Log Message:
-----------
Change the style of pragma Warnings(...) to only one argument to be compatible with pre-4.3 GNAT.

Modified Paths:
--------------
    trunk/bindings/ada/plplot.ads.cmake
    trunk/bindings/ada/plplot_traditional.ads.cmake
    trunk/examples/ada/x20a.adb.cmake
    trunk/examples/ada/xthick20a.adb.cmake

Modified: trunk/bindings/ada/plplot.ads.cmake
===================================================================
--- trunk/bindings/ada/plplot.ads.cmake	2009-01-03 22:21:06 UTC (rev 9250)
+++ trunk/bindings/ada/plplot.ads.cmake	2009-01-04 21:46:04 UTC (rev 9251)
@@ -69,13 +69,13 @@
     -- from this package (PLplot_Traditional) can't be used. Thus, this also
     -- overloads the name Fill_Polygon. It might never occur to the Ada programmer 
     -- that this is happening, which is good.
-    pragma Warnings(Off, "foreign caller must pass bounds explicitly");
-    pragma Warnings(Off, "type of argument ""Fill_Polygon.x"" is unconstrained array");
-    pragma Warnings(Off, "type of argument ""Fill_Polygon.y"" is unconstrained array");
+    -- Suppress these warnings compatibly with pre-4.3 GNAT:
+    --    "foreign caller must pass bounds explicitly"
+    --    "type of argument ""plfill.x"" is unconstrained array"
+    --    "type of argument ""plfill.y"" is unconstrained array"
+    pragma Warnings(Off);
     procedure Fill_Polygon(length : Integer; x, y : Real_Vector) renames PLplot_Thin.plfill;
-    pragma Warnings(On, "foreign caller must pass bounds explicitly");
-    pragma Warnings(On, "type of argument ""Fill_Polygon.x"" is unconstrained array");
-    pragma Warnings(On, "type of argument ""Fill_Polygon.y"" is unconstrained array");
+    pragma Warnings(On);
     
     -- Make Mask_Function_Pointer_Type available to the user so that s/he doesn't 
     -- have to "with" PLplot_Thin. Note that it is also used herein.

Modified: trunk/bindings/ada/plplot_traditional.ads.cmake
===================================================================
--- trunk/bindings/ada/plplot_traditional.ads.cmake	2009-01-03 22:21:06 UTC (rev 9250)
+++ trunk/bindings/ada/plplot_traditional.ads.cmake	2009-01-04 21:46:04 UTC (rev 9251)
@@ -69,13 +69,13 @@
     -- from this package (PLplot_Traditional) can't be used. Thus, this also
     -- overloads the name plfill. It might never occur to the Ada programmer 
     -- that this is happening, which is good.
-    pragma Warnings(Off, "foreign caller must pass bounds explicitly");
-    pragma Warnings(Off, "type of argument ""plfill.x"" is unconstrained array");
-    pragma Warnings(Off, "type of argument ""plfill.y"" is unconstrained array");
+    -- Suppress these warnings compatibly with pre-4.3 GNAT:
+    --    "foreign caller must pass bounds explicitly"
+    --    "type of argument ""plfill.x"" is unconstrained array"
+    --    "type of argument ""plfill.y"" is unconstrained array"
+    pragma Warnings(Off);
     procedure plfill(length : Integer; x, y : Real_Vector) renames PLplot_Thin.plfill;
-    pragma Warnings(On, "foreign caller must pass bounds explicitly");
-    pragma Warnings(On, "type of argument ""plfill.x"" is unconstrained array");
-    pragma Warnings(On, "type of argument ""plfill.y"" is unconstrained array");
+    pragma Warnings(On);
     
     -- Make Mask_Function_Pointer_Type available to the user so that s/he doesn't 
     -- have to "with" PLplot_Thin. Note that it is also used herein.

Modified: trunk/examples/ada/x20a.adb.cmake
===================================================================
--- trunk/examples/ada/x20a.adb.cmake	2009-01-03 22:21:06 UTC (rev 9250)
+++ trunk/examples/ada/x20a.adb.cmake	2009-01-04 21:46:04 UTC (rev 9251)
@@ -142,11 +142,10 @@
                     xxi := gin.wX;
                     yyi := gin.wY;
                     if start /= 0 then
-                        pragma Warnings(Off, """sx"" may be referenced before it has a value");
-                        pragma Warnings(Off, """sy"" may be referenced before it has a value");
+                        -- Suppress warning """sy"" may be referenced before it has a value".
+                        pragma Warnings(Off);
                         plline(sx, sy); -- Clear previous rectangle.
-                        pragma Warnings(On, """sx"" may be referenced before it has a value");
-                        pragma Warnings(On, """sy"" may be referenced before it has a value");
+                        pragma Warnings(On);
                     end if;
         
                     start := 0;

Modified: trunk/examples/ada/xthick20a.adb.cmake
===================================================================
--- trunk/examples/ada/xthick20a.adb.cmake	2009-01-03 22:21:06 UTC (rev 9250)
+++ trunk/examples/ada/xthick20a.adb.cmake	2009-01-04 21:46:04 UTC (rev 9251)
@@ -142,11 +142,10 @@
                     xxi := gin.wX;
                     yyi := gin.wY;
                     if start /= 0 then
-                        pragma Warnings(Off, """sx"" may be referenced before it has a value");
-                        pragma Warnings(Off, """sy"" may be referenced before it has a value");
+                        -- Suppress warning """sy"" may be referenced before it has a value".
+                        pragma Warnings(Off);
                         Draw_Curve(sx, sy); -- Clear previous rectangle.
-                        pragma Warnings(On, """sx"" may be referenced before it has a value");
-                        pragma Warnings(On, """sy"" may be referenced before it has a value");
+                        pragma Warnings(On);
                     end if;
         
                     start := 0;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.