Menu
▾
▴
[Plplot-cvs] SF.net SVN: plplot:[8749] trunk
|
From: <jb...@us...> - 2008-09-04 20:55:46
|
Revision: 8749
http://plplot.svn.sourceforge.net/plplot/?rev=8749&view=rev
Author: jbauck
Date: 2008-09-04 20:55:52 +0000 (Thu, 04 Sep 2008)
Log Message:
-----------
Attempted to fix the problem with the callback in Ada examples 19. When C calls an Ada subprogram while passing an unconstrained array, even if C calling conventions are in force, there is no guarantee that anything will work since C has no way of passing the array start to Ada and Ada will just take a guess (worst case) or issue a warning or error (but not GNAT) or naively look up a bogus number. I have thus used a constrained array of bounds 0 .. 2000 for the mapping function called by plmap and plmeridians, in the API called mapform.
There is a discussion of this issue at http://groups.google.com/group/comp.lang.ada/browse_thread/thread/0e5a3abec221df39?hl=en#.
As an unrelated set of edits (included here because SVN write was down for maintenance earlier):
Removed the requirement of with-ing PLplot_Auxiliary in user programs. PLplot_Auxiliary is still available as a convenience to the user but with reduced functionality, providing only vector and matrix maximum and minimum calculations. It is used in several of the examples as well as the thick bindings.
Modified Paths:
--------------
trunk/bindings/ada/plplot.ads.cmake
trunk/bindings/ada/plplot_auxiliary.ads.cmake
trunk/bindings/ada/plplot_thin.adb.cmake
trunk/bindings/ada/plplot_thin.ads.cmake
trunk/bindings/ada/plplot_traditional.ads.cmake
trunk/examples/ada/x01a.adb.cmake
trunk/examples/ada/x02a.adb.cmake
trunk/examples/ada/x03a.adb.cmake
trunk/examples/ada/x04a.adb.cmake
trunk/examples/ada/x05a.adb.cmake
trunk/examples/ada/x06a.adb.cmake
trunk/examples/ada/x07a.adb.cmake
trunk/examples/ada/x10a.adb.cmake
trunk/examples/ada/x12a.adb.cmake
trunk/examples/ada/x13a.adb.cmake
trunk/examples/ada/x14a.adb.cmake
trunk/examples/ada/x17a.adb.cmake
trunk/examples/ada/x18a.adb.cmake
trunk/examples/ada/x19a.adb.cmake
trunk/examples/ada/x23a.adb.cmake
trunk/examples/ada/x24a.adb.cmake
trunk/examples/ada/x25a.adb.cmake
trunk/examples/ada/x26a.adb.cmake
trunk/examples/ada/x27a.adb.cmake
trunk/examples/ada/x28a.adb.cmake
trunk/examples/ada/x29a.adb.cmake
trunk/examples/ada/x30a.adb.cmake
trunk/examples/ada/xthick01a.adb.cmake
trunk/examples/ada/xthick02a.adb.cmake
trunk/examples/ada/xthick03a.adb.cmake
trunk/examples/ada/xthick04a.adb.cmake
trunk/examples/ada/xthick05a.adb.cmake
trunk/examples/ada/xthick06a.adb.cmake
trunk/examples/ada/xthick07a.adb.cmake
trunk/examples/ada/xthick13a.adb.cmake
trunk/examples/ada/xthick14a.adb.cmake
trunk/examples/ada/xthick17a.adb.cmake
trunk/examples/ada/xthick18a.adb.cmake
trunk/examples/ada/xthick19a.adb.cmake
trunk/examples/ada/xthick23a.adb.cmake
trunk/examples/ada/xthick24a.adb.cmake
trunk/examples/ada/xthick25a.adb.cmake
trunk/examples/ada/xthick26a.adb.cmake
trunk/examples/ada/xthick27a.adb.cmake
trunk/examples/ada/xthick28a.adb.cmake
trunk/examples/ada/xthick29a.adb.cmake
trunk/examples/ada/xthick30a.adb.cmake
Modified: trunk/bindings/ada/plplot.ads.cmake
===================================================================
--- trunk/bindings/ada/plplot.ads.cmake 2008-09-04 19:06:12 UTC (rev 8748)
+++ trunk/bindings/ada/plplot.ads.cmake 2008-09-04 20:55:52 UTC (rev 8749)
@@ -22,14 +22,12 @@
with
PLplot_Thin,
- PLplot_Auxiliary,
System,
Interfaces.C.Pointers,
Ada.Strings.Unbounded,
Ada.Strings.Maps;
use
PLplot_Thin,
- PLplot_Auxiliary,
Ada.Strings.Unbounded;
-- COMMENT THIS LINE IF YOUR COMPILER DOES NOT INCLUDE THESE
@@ -39,6 +37,10 @@
package PLplot is
+ -- "Rename" some useful types from the thin binding.
+ subtype Boolean_Array_1D is PLplot_Thin.Boolean_Array_1D;
+ subtype Integer_Array_1D is PLplot_Thin.Integer_Array_1D;
+
-- "Rename" some types mainly used for contour plots and the like so that
-- user programs can see them without with-ing PLplot_thin. It might be
-- good to remove "use PLplot_Thin" for clarity since it is used in only
@@ -70,6 +72,9 @@
-- "Rename" callback for map functions plmap and plmeridians.
subtype Map_Form_Function_Pointer_Type is Plplot_Thin.Map_Form_Function_Pointer_Type;
+
+ -- "Rename" the necessarily constrained array for mapping longitudes and latitudes.
+ subtype Map_Form_Constrained_Array is PLplot_Thin.Map_Form_Constrained_Array;
--------------------------------------------------------------------------------
-- Types and constants for thick binding --
Modified: trunk/bindings/ada/plplot_auxiliary.ads.cmake
===================================================================
--- trunk/bindings/ada/plplot_auxiliary.ads.cmake 2008-09-04 19:06:12 UTC (rev 8748)
+++ trunk/bindings/ada/plplot_auxiliary.ads.cmake 2008-09-04 20:55:52 UTC (rev 8749)
@@ -53,8 +53,8 @@
@Ada_Is_Not_2007_Vector_Matrix_Declarations@
-- Other array types for the bindings.
- type Boolean_Array_1D is array (Integer range <>) of Boolean;
- type Integer_Array_1D is array (Integer range <>) of Integer;
+-- type Boolean_Array_1D is array (Integer range <>) of Boolean;
+-- type Integer_Array_1D is array (Integer range <>) of Integer;
--------------------------------------------------------------------------------
@@ -83,14 +83,4 @@
-- Find maximum in a 2D array.
function Matrix_Max(x : Real_Matrix) return Long_Float;
-
---------------------------------------------------------------------------------
--- String things useful in compiling the examples --
---------------------------------------------------------------------------------
-
- -- Convenient string of length 80
- package Bounded_String_80 is
- new Ada.Strings.Bounded.Generic_Bounded_Length(80);
- subtype String_80 is Bounded_String_80.Bounded_String;
-
end PLplot_Auxiliary;
Modified: trunk/bindings/ada/plplot_thin.adb.cmake
===================================================================
--- trunk/bindings/ada/plplot_thin.adb.cmake 2008-09-04 19:06:12 UTC (rev 8748)
+++ trunk/bindings/ada/plplot_thin.adb.cmake 2008-09-04 20:55:52 UTC (rev 8749)
@@ -21,11 +21,9 @@
-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
with
- PLplot_Auxiliary,
Ada.Text_IO,
System.Address_To_Access_Conversions;
use
- PLplot_Auxiliary,
Ada.Text_IO;
package body PLplot_Thin is
Modified: trunk/bindings/ada/plplot_thin.ads.cmake
===================================================================
--- trunk/bindings/ada/plplot_thin.ads.cmake 2008-09-04 19:06:12 UTC (rev 8748)
+++ trunk/bindings/ada/plplot_thin.ads.cmake 2008-09-04 20:55:52 UTC (rev 8749)
@@ -33,7 +33,6 @@
-- this is right.
with
- PLplot_Auxiliary,
Interfaces.C,
Interfaces.C.Pointers,
System,
@@ -41,7 +40,6 @@
Ada.Strings.Bounded,
Ada.Strings.Unbounded;
use
- PLplot_Auxiliary,
Interfaces.C,
Ada.Text_IO,
Ada.Strings.Bounded,
@@ -59,9 +57,10 @@
PLtrue : constant Integer := 1;
subtype PLBOOL is Integer range PLfalse..PLtrue;
type PLUNICODE is mod 2**32;
--- subtype Unsigned_Int is mod 2**32; -- for e.g. plseed
--- subtype Unsigned_Int is Integer range 0 .. 2**31 - 1; -- for e.g. plseed fix this
+ type Boolean_Array_1D is array (Integer range <>) of Boolean;
+ type Integer_Array_1D is array (Integer range <>) of Integer;
+
subtype PL_Integer_Array is Integer_Array_1D;
subtype PL_Float_Array is Real_Vector;
subtype PL_Float_Array_2D is Real_Matrix;
@@ -127,13 +126,24 @@
-- Returns 1 if point is to be plotted, 0 if not.
type Mask_Function_Pointer_Type is access
function (x, y : PLFLT) return Integer;
-
+ -- Make a constrained array for use by plmap (Draw_Map) and
+ -- plmeridians (Draw_Latitude_Longitude). The reason that this is necessary
+ -- is that the callback structure for those routines requires that a C
+ -- subprogram calls an Ada subroutine *with an unconstrained array*. This
+ -- seems to be unique in the PLplot bindings. For a discussion of this, see
+ -- http://groups.google.com/group/comp.lang.ada/browse_thread/thread/0e5a3abec221df39?hl=en#
+ -- If the user needs to have a larger array, it will require making this
+ -- array longer, but we try to anticipate the most extreme situation here
+ -- without being too wasteful. Note that the user will typically use only a
+ -- portion of the array, beginning at index 0.
+ subtype Map_Form_Constrained_Array is Real_Vector(0 .. 2000);
+
-- Access-to-procedure type for plotting map outlines (continents).
-- Length_Of_x is x'Length or y'Length; this is the easiest way to match the
-- C formal arguments.
type Map_Form_Function_Pointer_Type is access
- procedure (Length_Of_x : Integer; x, y : in out Real_Vector);
+ procedure (Length_Of_x : Integer; x, y : in out Map_Form_Constrained_Array);
pragma Convention(Convention => C, Entity => Map_Form_Function_Pointer_Type);
Modified: trunk/bindings/ada/plplot_traditional.ads.cmake
===================================================================
--- trunk/bindings/ada/plplot_traditional.ads.cmake 2008-09-04 19:06:12 UTC (rev 8748)
+++ trunk/bindings/ada/plplot_traditional.ads.cmake 2008-09-04 20:55:52 UTC (rev 8749)
@@ -22,14 +22,12 @@
with
PLplot_Thin,
- PLplot_Auxiliary,
System,
Interfaces.C.Pointers,
Ada.Strings.Unbounded,
Ada.Strings.Maps;
use
PLplot_Thin,
- PLplot_Auxiliary,
Ada.Strings.Unbounded;
-- COMMENT THIS LINE IF YOUR COMPILER DOES NOT INCLUDE THESE
@@ -39,6 +37,10 @@
package PLplot_Traditional is
+ -- "Rename" some useful types from the thin binding.
+ subtype Boolean_Array_1D is PLplot_Thin.Boolean_Array_1D;
+ subtype Integer_Array_1D is PLplot_Thin.Integer_Array_1D;
+
-- "Rename" some types mainly used for contour plots and the like so that
-- user programs can see them without with-ing PLplot_thin. It might be
-- good to remove "use PLplot_Thin" for clarity since it is used in only
@@ -49,7 +51,7 @@
subtype Transformation_Data_Type_2 is Plplot_Thin.Transformation_Data_Type_2;
subtype Graphics_Input_Record_Type is Plplot_Thin.PLGraphicsIn;
- -- "Rename" the unicode type for characters.
+ -- "Rename" the unicode type for characters.
subtype Unicode is PLplot_Thin.PLUNICODE;
-- Rename Plplot_Thin.plfill so that a pointer to it can be passed to
@@ -70,6 +72,9 @@
-- "Rename" callback for map functions plmap and plmeridians.
subtype Map_Form_Function_Pointer_Type is Plplot_Thin.Map_Form_Function_Pointer_Type;
+
+ -- "Rename" the necessarily constrained array for mapping longitudes and latitudes.
+ subtype Map_Form_Constrained_Array is PLplot_Thin.Map_Form_Constrained_Array;
--------------------------------------------------------------------------------
-- Types and constants for thick binding --
Modified: trunk/examples/ada/x01a.adb.cmake
===================================================================
--- trunk/examples/ada/x01a.adb.cmake 2008-09-04 19:06:12 UTC (rev 8748)
+++ trunk/examples/ada/x01a.adb.cmake 2008-09-04 20:55:52 UTC (rev 8749)
@@ -24,14 +24,12 @@
Ada.Text_IO,
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
- PLplot_Traditional,
- PLplot_Auxiliary;
+ PLplot_Traditional;
use
Ada.Text_IO,
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
- PLplot_Traditional,
- PLplot_Auxiliary;
+ PLplot_Traditional;
-- COMMENT THIS LINE IF YOUR COMPILER DOES NOT INCLUDE THESE
-- DEFINITIONS, FOR EXAMPLE, IF IT IS NOT ADA 2005 WITH ANNEX G.3 COMPLIANCE.
@@ -43,7 +41,6 @@
xscale, yscale, xoff, yoff : Long_Float;
fontset : Integer := 1;
notes : String := "Make sure you get it right!";
- ver : String_80;
procedure plot1 is
xmin, xmax, ymin, ymax : Long_Float;
Modified: trunk/examples/ada/x02a.adb.cmake
===================================================================
--- trunk/examples/ada/x02a.adb.cmake 2008-09-04 19:06:12 UTC (rev 8748)
+++ trunk/examples/ada/x02a.adb.cmake 2008-09-04 20:55:52 UTC (rev 8749)
@@ -25,16 +25,14 @@
Ada.Numerics.Long_Elementary_Functions,
Ada.Strings,
Ada.Strings.Fixed,
- PLplot_Traditional,
- PLplot_Auxiliary;
+ PLplot_Traditional;
use
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
Ada.Strings,
Ada.Strings.Fixed,
- PLplot_Traditional,
- PLplot_Auxiliary;
+ PLplot_Traditional;
-- COMMENT THIS LINE IF YOUR COMPILER DOES NOT INCLUDE THESE
-- DEFINITIONS, FOR EXAMPLE, IF IT IS NOT ADA 2005 WITH ANNEX G.3 COMPLIANCE.
Modified: trunk/examples/ada/x03a.adb.cmake
===================================================================
--- trunk/examples/ada/x03a.adb.cmake 2008-09-04 19:06:12 UTC (rev 8748)
+++ trunk/examples/ada/x03a.adb.cmake 2008-09-04 20:55:52 UTC (rev 8749)
@@ -26,15 +26,13 @@
Ada.Numerics.Long_Elementary_Functions,
Ada.Strings,
Ada.Strings.Fixed,
- PLplot_Traditional,
- PLplot_Auxiliary;
+ PLplot_Traditional;
use
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
Ada.Strings,
Ada.Strings.Fixed,
- PLplot_Traditional,
- PLplot_Auxiliary;
+ PLplot_Traditional;
-- COMMENT THIS LINE IF YOUR COMPILER DOES NOT INCLUDE THESE
-- DEFINITIONS, FOR EXAMPLE, IF IT IS NOT ADA 2005 WITH ANNEX G.3 COMPLIANCE.
Modified: trunk/examples/ada/x04a.adb.cmake
===================================================================
--- trunk/examples/ada/x04a.adb.cmake 2008-09-04 19:06:12 UTC (rev 8748)
+++ trunk/examples/ada/x04a.adb.cmake 2008-09-04 20:55:52 UTC (rev 8749)
@@ -23,13 +23,11 @@
with
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
- PLplot_Traditional,
- PLplot_Auxiliary;
+ PLplot_Traditional;
use
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
- PLplot_Traditional,
- PLplot_Auxiliary;
+ PLplot_Traditional;
-- COMMENT THIS LINE IF YOUR COMPILER DOES NOT INCLUDE THESE
-- DEFINITIONS, FOR EXAMPLE, IF IT IS NOT ADA 2005 WITH ANNEX G.3 COMPLIANCE.
Modified: trunk/examples/ada/x05a.adb.cmake
===================================================================
--- trunk/examples/ada/x05a.adb.cmake 2008-09-04 19:06:12 UTC (rev 8748)
+++ trunk/examples/ada/x05a.adb.cmake 2008-09-04 20:55:52 UTC (rev 8749)
@@ -24,13 +24,11 @@
with
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
- PLplot_Traditional,
- PLplot_Auxiliary;
+ PLplot_Traditional;
use
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
- PLplot_Traditional,
- PLplot_Auxiliary;
+ PLplot_Traditional;
-- COMMENT THIS LINE IF YOUR COMPILER DOES NOT INCLUDE THESE
-- DEFINITIONS, FOR EXAMPLE, IF IT IS NOT ADA 2005 WITH ANNEX G.3 COMPLIANCE.
Modified: trunk/examples/ada/x06a.adb.cmake
===================================================================
--- trunk/examples/ada/x06a.adb.cmake 2008-09-04 19:06:12 UTC (rev 8748)
+++ trunk/examples/ada/x06a.adb.cmake 2008-09-04 20:55:52 UTC (rev 8749)
@@ -25,15 +25,13 @@
Ada.Strings.Fixed,
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
- PLplot_Traditional,
- PLplot_Auxiliary;
+ PLplot_Traditional;
use
Ada.Strings,
Ada.Strings.Fixed,
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
- PLplot_Traditional,
- PLplot_Auxiliary;
+ PLplot_Traditional;
-- COMMENT THIS LINE IF YOUR COMPILER DOES NOT INCLUDE THESE
-- DEFINITIONS, FOR EXAMPLE, IF IT IS NOT ADA 2005 WITH ANNEX G.3 COMPLIANCE.
Modified: trunk/examples/ada/x07a.adb.cmake
===================================================================
--- trunk/examples/ada/x07a.adb.cmake 2008-09-04 19:06:12 UTC (rev 8748)
+++ trunk/examples/ada/x07a.adb.cmake 2008-09-04 20:55:52 UTC (rev 8749)
@@ -25,15 +25,13 @@
Ada.Strings.Fixed,
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
- PLplot_Traditional,
- PLplot_Auxiliary;
+ PLplot_Traditional;
use
Ada.Strings,
Ada.Strings.Fixed,
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
- PLplot_Traditional,
- PLplot_Auxiliary;
+ PLplot_Traditional;
-- COMMENT THIS LINE IF YOUR COMPILER DOES NOT INCLUDE THESE
-- DEFINITIONS, FOR EXAMPLE, IF IT IS NOT ADA 2005 WITH ANNEX G.3 COMPLIANCE.
Modified: trunk/examples/ada/x10a.adb.cmake
===================================================================
--- trunk/examples/ada/x10a.adb.cmake 2008-09-04 19:06:12 UTC (rev 8748)
+++ trunk/examples/ada/x10a.adb.cmake 2008-09-04 20:55:52 UTC (rev 8749)
@@ -23,13 +23,11 @@
with
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
- PLplot_Traditional,
- PLplot_Auxiliary;
+ PLplot_Traditional;
use
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
- PLplot_Traditional,
- PLplot_Auxiliary;
+ PLplot_Traditional;
-- COMMENT THIS LINE IF YOUR COMPILER DOES NOT INCLUDE THESE
-- DEFINITIONS, FOR EXAMPLE, IF IT IS NOT ADA 2005 WITH ANNEX G.3 COMPLIANCE.
Modified: trunk/examples/ada/x12a.adb.cmake
===================================================================
--- trunk/examples/ada/x12a.adb.cmake 2008-09-04 19:06:12 UTC (rev 8748)
+++ trunk/examples/ada/x12a.adb.cmake 2008-09-04 20:55:52 UTC (rev 8749)
@@ -25,16 +25,14 @@
Ada.Numerics.Long_Elementary_Functions,
Ada.Strings,
Ada.Strings.Fixed,
- PLplot_Traditional,
- PLplot_Auxiliary;
+ PLplot_Traditional;
use
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
Ada.Strings,
Ada.Strings.Fixed,
- PLplot_Traditional,
- PLplot_Auxiliary;
+ PLplot_Traditional;
-- COMMENT THIS LINE IF YOUR COMPILER DOES NOT INCLUDE THESE
-- DEFINITIONS, FOR EXAMPLE, IF IT IS NOT ADA 2005 WITH ANNEX G.3 COMPLIANCE.
Modified: trunk/examples/ada/x13a.adb.cmake
===================================================================
--- trunk/examples/ada/x13a.adb.cmake 2008-09-04 19:06:12 UTC (rev 8748)
+++ trunk/examples/ada/x13a.adb.cmake 2008-09-04 20:55:52 UTC (rev 8749)
@@ -23,13 +23,11 @@
with
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
- PLplot_Traditional,
- PLplot_Auxiliary;
+ PLplot_Traditional;
use
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
- PLplot_Traditional,
- PLplot_Auxiliary;
+ PLplot_Traditional;
-- COMMENT THIS LINE IF YOUR COMPILER DOES NOT INCLUDE THESE
-- DEFINITIONS, FOR EXAMPLE, IF IT IS NOT ADA 2005 WITH ANNEX G.3 COMPLIANCE.
Modified: trunk/examples/ada/x14a.adb.cmake
===================================================================
--- trunk/examples/ada/x14a.adb.cmake 2008-09-04 19:06:12 UTC (rev 8748)
+++ trunk/examples/ada/x14a.adb.cmake 2008-09-04 20:55:52 UTC (rev 8749)
@@ -31,8 +31,7 @@
Ada.Strings.Unbounded,
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
- PLplot_Traditional,
- PLplot_Auxiliary;
+ PLplot_Traditional;
use
Ada.Text_IO,
Ada.Numerics,
@@ -40,8 +39,7 @@
Ada.Strings.Fixed,
Ada.Strings.Unbounded,
Ada.Numerics.Long_Elementary_Functions,
- PLplot_Traditional,
- PLplot_Auxiliary;
+ PLplot_Traditional;
-- COMMENT THIS LINE IF YOUR COMPILER DOES NOT INCLUDE THESE
-- DEFINITIONS, FOR EXAMPLE, IF IT IS NOT ADA 2005 WITH ANNEX G.3 COMPLIANCE.
Modified: trunk/examples/ada/x17a.adb.cmake
===================================================================
--- trunk/examples/ada/x17a.adb.cmake 2008-09-04 19:06:12 UTC (rev 8748)
+++ trunk/examples/ada/x17a.adb.cmake 2008-09-04 20:55:52 UTC (rev 8749)
@@ -26,16 +26,14 @@
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
Ada.Numerics.Float_Random,
- PLplot_Traditional,
- PLplot_Auxiliary;
+ PLplot_Traditional;
use
Ada.Text_IO,
Ada.Strings.Unbounded,
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
Ada.Numerics.Float_Random,
- PLplot_Traditional,
- PLplot_Auxiliary;
+ PLplot_Traditional;
-- COMMENT THIS LINE IF YOUR COMPILER DOES NOT INCLUDE THESE
-- DEFINITIONS, FOR EXAMPLE, IF IT IS NOT ADA 2005 WITH ANNEX G.3 COMPLIANCE.
Modified: trunk/examples/ada/x18a.adb.cmake
===================================================================
--- trunk/examples/ada/x18a.adb.cmake 2008-09-04 19:06:12 UTC (rev 8748)
+++ trunk/examples/ada/x18a.adb.cmake 2008-09-04 20:55:52 UTC (rev 8749)
@@ -26,15 +26,13 @@
Ada.Numerics.Long_Elementary_Functions,
Ada.Strings,
Ada.Strings.Fixed,
- PLplot_Traditional,
- PLplot_Auxiliary;
+ PLplot_Traditional;
use
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
Ada.Strings,
Ada.Strings.Fixed,
- PLplot_Traditional,
- PLplot_Auxiliary;
+ PLplot_Traditional;
-- COMMENT THIS LINE IF YOUR COMPILER DOES NOT INCLUDE THESE
-- DEFINITIONS, FOR EXAMPLE, IF IT IS NOT ADA 2005 WITH ANNEX G.3 COMPLIANCE.
Modified: trunk/examples/ada/x19a.adb.cmake
===================================================================
--- trunk/examples/ada/x19a.adb.cmake 2008-09-04 19:06:12 UTC (rev 8748)
+++ trunk/examples/ada/x19a.adb.cmake 2008-09-04 20:55:52 UTC (rev 8749)
@@ -24,13 +24,11 @@
with
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
- PLplot_Traditional,
- PLplot_Auxiliary;
+ PLplot_Traditional;
use
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
- PLplot_Traditional,
- PLplot_Auxiliary;
+ PLplot_Traditional;
-- COMMENT THIS LINE IF YOUR COMPILER DOES NOT INCLUDE THESE
-- DEFINITIONS, FOR EXAMPLE, IF IT IS NOT ADA 2005 WITH ANNEX G.3 COMPLIANCE.
@@ -43,7 +41,7 @@
-- This spec is necessary in order to enforce C calling conventions, used
-- in the callback by intervening C code.
- procedure mapform19(n : Integer; x, y : in out Real_Vector);
+ procedure mapform19(n : Integer; x, y : in out Map_Form_Constrained_Array);
pragma Convention(C, mapform19);
-- Defines specific coordinate transformation for example 19.
@@ -57,7 +55,7 @@
-- wrapper function inside plmap and plmeridians that has the "correct" C
-- argument list, and then pass a pointer to _that_ when calling plmap and
-- plmeridian.
- procedure mapform19(n : Integer; x, y : in out Real_Vector) is
+ procedure mapform19(n : Integer; x, y : in out Map_Form_Constrained_Array) is
xp, yp, radius : Long_Float;
begin
-- DO NOT use x'range for this loop because the C function which calls
Modified: trunk/examples/ada/x23a.adb.cmake
===================================================================
--- trunk/examples/ada/x23a.adb.cmake 2008-09-04 19:06:12 UTC (rev 8748)
+++ trunk/examples/ada/x23a.adb.cmake 2008-09-04 20:55:52 UTC (rev 8749)
@@ -29,8 +29,7 @@
Ada.Strings.Fixed,
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
- PLplot_Traditional,
- PLplot_Auxiliary;
+ PLplot_Traditional;
use
Ada.Text_IO,
Ada.Integer_Text_IO,
@@ -39,8 +38,7 @@
Ada.Strings.Fixed,
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
- PLplot_Traditional,
- PLplot_Auxiliary;
+ PLplot_Traditional;
-- COMMENT THIS LINE IF YOUR COMPILER DOES NOT INCLUDE THESE
-- DEFINITIONS, FOR EXAMPLE, IF IT IS NOT ADA 2005 WITH ANNEX G.3 COMPLIANCE.
Modified: trunk/examples/ada/x24a.adb.cmake
===================================================================
--- trunk/examples/ada/x24a.adb.cmake 2008-09-04 19:06:12 UTC (rev 8748)
+++ trunk/examples/ada/x24a.adb.cmake 2008-09-04 20:55:52 UTC (rev 8749)
@@ -21,11 +21,9 @@
-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
with
- PLplot_Traditional,
- PLplot_Auxiliary;
+ PLplot_Traditional;
use
- PLplot_Traditional,
- PLplot_Auxiliary;
+ PLplot_Traditional;
-- COMMENT THIS LINE IF YOUR COMPILER DOES NOT INCLUDE THESE
-- DEFINITIONS, FOR EXAMPLE, IF IT IS NOT ADA 2005 WITH ANNEX G.3 COMPLIANCE.
Modified: trunk/examples/ada/x25a.adb.cmake
===================================================================
--- trunk/examples/ada/x25a.adb.cmake 2008-09-04 19:06:12 UTC (rev 8748)
+++ trunk/examples/ada/x25a.adb.cmake 2008-09-04 20:55:52 UTC (rev 8749)
@@ -21,11 +21,9 @@
-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
with
- PLplot_Traditional,
- PLplot_Auxiliary;
+ PLplot_Traditional;
use
- PLplot_Traditional,
- PLplot_Auxiliary;
+ PLplot_Traditional;
-- COMMENT THIS LINE IF YOUR COMPILER DOES NOT INCLUDE THESE
-- DEFINITIONS, FOR EXAMPLE, IF IT IS NOT ADA 2005 WITH ANNEX G.3 COMPLIANCE.
Modified: trunk/examples/ada/x26a.adb.cmake
===================================================================
--- trunk/examples/ada/x26a.adb.cmake 2008-09-04 19:06:12 UTC (rev 8748)
+++ trunk/examples/ada/x26a.adb.cmake 2008-09-04 20:55:52 UTC (rev 8749)
@@ -57,13 +57,11 @@
with
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
- PLplot_Traditional,
- PLplot_Auxiliary;
+ PLplot_Traditional;
use
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
- PLplot_Traditional,
- PLplot_Auxiliary;
+ PLplot_Traditional;
-- COMMENT THIS LINE IF YOUR COMPILER DOES NOT INCLUDE THESE
-- DEFINITIONS, FOR EXAMPLE, IF IT IS NOT ADA 2005 WITH ANNEX G.3 COMPLIANCE.
Modified: trunk/examples/ada/x27a.adb.cmake
===================================================================
--- trunk/examples/ada/x27a.adb.cmake 2008-09-04 19:06:12 UTC (rev 8748)
+++ trunk/examples/ada/x27a.adb.cmake 2008-09-04 20:55:52 UTC (rev 8749)
@@ -22,12 +22,10 @@
with
Ada.Numerics.Long_Elementary_Functions,
- PLplot_Traditional,
- PLplot_Auxiliary;
+ PLplot_Traditional;
use
Ada.Numerics.Long_Elementary_Functions,
- PLplot_Traditional,
- PLplot_Auxiliary;
+ PLplot_Traditional;
-- COMMENT THIS LINE IF YOUR COMPILER DOES NOT INCLUDE THESE
-- DEFINITIONS, FOR EXAMPLE, IF IT IS NOT ADA 2005 WITH ANNEX G.3 COMPLIANCE.
Modified: trunk/examples/ada/x28a.adb.cmake
===================================================================
--- trunk/examples/ada/x28a.adb.cmake 2008-09-04 19:06:12 UTC (rev 8748)
+++ trunk/examples/ada/x28a.adb.cmake 2008-09-04 20:55:52 UTC (rev 8749)
@@ -23,13 +23,11 @@
with
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
- PLplot_Traditional,
- PLplot_Auxiliary;
+ PLplot_Traditional;
use
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
- PLplot_Traditional,
- PLplot_Auxiliary;
+ PLplot_Traditional;
-- COMMENT THIS LINE IF YOUR COMPILER DOES NOT INCLUDE THESE
-- DEFINITIONS, FOR EXAMPLE, IF IT IS NOT ADA 2005 WITH ANNEX G.3 COMPLIANCE.
Modified: trunk/examples/ada/x29a.adb.cmake
===================================================================
--- trunk/examples/ada/x29a.adb.cmake 2008-09-04 19:06:12 UTC (rev 8748)
+++ trunk/examples/ada/x29a.adb.cmake 2008-09-04 20:55:52 UTC (rev 8749)
@@ -24,14 +24,12 @@
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
Ada.Calendar,
- PLplot_Traditional,
- PLplot_Auxiliary;
+ PLplot_Traditional;
use
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
Ada.Calendar,
- PLplot_Traditional,
- PLplot_Auxiliary;
+ PLplot_Traditional;
-- COMMENT THIS LINE IF YOUR COMPILER DOES NOT INCLUDE THESE
-- DEFINITIONS, FOR EXAMPLE, IF IT IS NOT ADA 2005 WITH ANNEX G.3 COMPLIANCE.
Modified: trunk/examples/ada/x30a.adb.cmake
===================================================================
--- trunk/examples/ada/x30a.adb.cmake 2008-09-04 19:06:12 UTC (rev 8748)
+++ trunk/examples/ada/x30a.adb.cmake 2008-09-04 20:55:52 UTC (rev 8749)
@@ -24,14 +24,12 @@
System,
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
- PLplot_Traditional,
- PLplot_Auxiliary;
+ PLplot_Traditional;
use
System,
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
- PLplot_Traditional,
- PLplot_Auxiliary;
+ PLplot_Traditional;
-- COMMENT THIS LINE IF YOUR COMPILER DOES NOT INCLUDE THESE
-- DEFINITIONS, FOR EXAMPLE, IF IT IS NOT ADA 2005 WITH ANNEX G.3 COMPLIANCE.
Modified: trunk/examples/ada/xthick01a.adb.cmake
===================================================================
--- trunk/examples/ada/xthick01a.adb.cmake 2008-09-04 19:06:12 UTC (rev 8748)
+++ trunk/examples/ada/xthick01a.adb.cmake 2008-09-04 20:55:52 UTC (rev 8749)
@@ -24,14 +24,12 @@
Ada.Text_IO,
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
- PLplot,
- PLplot_Auxiliary;
+ PLplot;
use
Ada.Text_IO,
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
- PLplot,
- PLplot_Auxiliary;
+ PLplot;
-- COMMENT THIS LINE IF YOUR COMPILER DOES NOT INCLUDE THESE
-- DEFINITIONS, FOR EXAMPLE, IF IT IS NOT ADA 2005 WITH ANNEX G.3 COMPLIANCE.
@@ -43,7 +41,6 @@
xscale, yscale, xoff, yoff : Long_Float;
fontset : Integer := 1;
notes : String := "Make sure you get it right!";
- ver : String_80;
procedure plot1 is
xmin, xmax, ymin, ymax : Long_Float;
Modified: trunk/examples/ada/xthick02a.adb.cmake
===================================================================
--- trunk/examples/ada/xthick02a.adb.cmake 2008-09-04 19:06:12 UTC (rev 8748)
+++ trunk/examples/ada/xthick02a.adb.cmake 2008-09-04 20:55:52 UTC (rev 8749)
@@ -25,16 +25,14 @@
Ada.Numerics.Long_Elementary_Functions,
Ada.Strings,
Ada.Strings.Fixed,
- PLplot,
- PLplot_Auxiliary;
+ PLplot;
use
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
Ada.Strings,
Ada.Strings.Fixed,
- PLplot,
- PLplot_Auxiliary;
+ PLplot;
-- COMMENT THIS LINE IF YOUR COMPILER DOES NOT INCLUDE THESE
-- DEFINITIONS, FOR EXAMPLE, IF IT IS NOT ADA 2005 WITH ANNEX G.3 COMPLIANCE.
Modified: trunk/examples/ada/xthick03a.adb.cmake
===================================================================
--- trunk/examples/ada/xthick03a.adb.cmake 2008-09-04 19:06:12 UTC (rev 8748)
+++ trunk/examples/ada/xthick03a.adb.cmake 2008-09-04 20:55:52 UTC (rev 8749)
@@ -26,15 +26,13 @@
Ada.Numerics.Long_Elementary_Functions,
Ada.Strings,
Ada.Strings.Fixed,
- PLplot,
- PLplot_Auxiliary;
+ PLplot;
use
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
Ada.Strings,
Ada.Strings.Fixed,
- PLplot,
- PLplot_Auxiliary;
+ PLplot;
-- COMMENT THIS LINE IF YOUR COMPILER DOES NOT INCLUDE THESE
-- DEFINITIONS, FOR EXAMPLE, IF IT IS NOT ADA 2005 WITH ANNEX G.3 COMPLIANCE.
Modified: trunk/examples/ada/xthick04a.adb.cmake
===================================================================
--- trunk/examples/ada/xthick04a.adb.cmake 2008-09-04 19:06:12 UTC (rev 8748)
+++ trunk/examples/ada/xthick04a.adb.cmake 2008-09-04 20:55:52 UTC (rev 8749)
@@ -23,13 +23,11 @@
with
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
- PLplot,
- PLplot_Auxiliary;
+ PLplot;
use
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
- PLplot,
- PLplot_Auxiliary;
+ PLplot;
-- COMMENT THIS LINE IF YOUR COMPILER DOES NOT INCLUDE THESE
-- DEFINITIONS, FOR EXAMPLE, IF IT IS NOT ADA 2005 WITH ANNEX G.3 COMPLIANCE.
Modified: trunk/examples/ada/xthick05a.adb.cmake
===================================================================
--- trunk/examples/ada/xthick05a.adb.cmake 2008-09-04 19:06:12 UTC (rev 8748)
+++ trunk/examples/ada/xthick05a.adb.cmake 2008-09-04 20:55:52 UTC (rev 8749)
@@ -24,13 +24,11 @@
with
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
- PLplot,
- PLplot_Auxiliary;
+ PLplot;
use
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
- PLplot,
- PLplot_Auxiliary;
+ PLplot;
-- COMMENT THIS LINE IF YOUR COMPILER DOES NOT INCLUDE THESE
-- DEFINITIONS, FOR EXAMPLE, IF IT IS NOT ADA 2005 WITH ANNEX G.3 COMPLIANCE.
Modified: trunk/examples/ada/xthick06a.adb.cmake
===================================================================
--- trunk/examples/ada/xthick06a.adb.cmake 2008-09-04 19:06:12 UTC (rev 8748)
+++ trunk/examples/ada/xthick06a.adb.cmake 2008-09-04 20:55:52 UTC (rev 8749)
@@ -25,15 +25,13 @@
Ada.Strings.Fixed,
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
- PLplot,
- PLplot_Auxiliary;
+ PLplot;
use
Ada.Strings,
Ada.Strings.Fixed,
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
- PLplot,
- PLplot_Auxiliary;
+ PLplot;
-- COMMENT THIS LINE IF YOUR COMPILER DOES NOT INCLUDE THESE
-- DEFINITIONS, FOR EXAMPLE, IF IT IS NOT ADA 2005 WITH ANNEX G.3 COMPLIANCE.
Modified: trunk/examples/ada/xthick07a.adb.cmake
===================================================================
--- trunk/examples/ada/xthick07a.adb.cmake 2008-09-04 19:06:12 UTC (rev 8748)
+++ trunk/examples/ada/xthick07a.adb.cmake 2008-09-04 20:55:52 UTC (rev 8749)
@@ -25,15 +25,13 @@
Ada.Strings.Fixed,
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
- PLplot,
- PLplot_Auxiliary;
+ PLplot;
use
Ada.Strings,
Ada.Strings.Fixed,
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
- PLplot,
- PLplot_Auxiliary;
+ PLplot;
-- COMMENT THIS LINE IF YOUR COMPILER DOES NOT INCLUDE THESE
-- DEFINITIONS, FOR EXAMPLE, IF IT IS NOT ADA 2005 WITH ANNEX G.3 COMPLIANCE.
Modified: trunk/examples/ada/xthick13a.adb.cmake
===================================================================
--- trunk/examples/ada/xthick13a.adb.cmake 2008-09-04 19:06:12 UTC (rev 8748)
+++ trunk/examples/ada/xthick13a.adb.cmake 2008-09-04 20:55:52 UTC (rev 8749)
@@ -23,13 +23,11 @@
with
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
- PLplot,
- PLplot_Auxiliary;
+ PLplot;
use
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
- PLplot,
- PLplot_Auxiliary;
+ PLplot;
-- COMMENT THIS LINE IF YOUR COMPILER DOES NOT INCLUDE THESE
-- DEFINITIONS, FOR EXAMPLE, IF IT IS NOT ADA 2005 WITH ANNEX G.3 COMPLIANCE.
Modified: trunk/examples/ada/xthick14a.adb.cmake
===================================================================
--- trunk/examples/ada/xthick14a.adb.cmake 2008-09-04 19:06:12 UTC (rev 8748)
+++ trunk/examples/ada/xthick14a.adb.cmake 2008-09-04 20:55:52 UTC (rev 8749)
@@ -31,8 +31,7 @@
Ada.Strings.Unbounded,
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
- PLplot,
- PLplot_Auxiliary;
+ PLplot;
use
Ada.Text_IO,
Ada.Numerics,
@@ -40,8 +39,7 @@
Ada.Strings.Fixed,
Ada.Strings.Unbounded,
Ada.Numerics.Long_Elementary_Functions,
- PLplot,
- PLplot_Auxiliary;
+ PLplot;
-- COMMENT THIS LINE IF YOUR COMPILER DOES NOT INCLUDE THESE
-- DEFINITIONS, FOR EXAMPLE, IF IT IS NOT ADA 2005 WITH ANNEX G.3 COMPLIANCE.
Modified: trunk/examples/ada/xthick17a.adb.cmake
===================================================================
--- trunk/examples/ada/xthick17a.adb.cmake 2008-09-04 19:06:12 UTC (rev 8748)
+++ trunk/examples/ada/xthick17a.adb.cmake 2008-09-04 20:55:52 UTC (rev 8749)
@@ -26,16 +26,14 @@
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
Ada.Numerics.Float_Random,
- PLplot,
- PLplot_Auxiliary;
+ PLplot;
use
Ada.Text_IO,
Ada.Strings.Unbounded,
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
Ada.Numerics.Float_Random,
- PLplot,
- PLplot_Auxiliary;
+ PLplot;
-- COMMENT THIS LINE IF YOUR COMPILER DOES NOT INCLUDE THESE
-- DEFINITIONS, FOR EXAMPLE, IF IT IS NOT ADA 2005 WITH ANNEX G.3 COMPLIANCE.
Modified: trunk/examples/ada/xthick18a.adb.cmake
===================================================================
--- trunk/examples/ada/xthick18a.adb.cmake 2008-09-04 19:06:12 UTC (rev 8748)
+++ trunk/examples/ada/xthick18a.adb.cmake 2008-09-04 20:55:52 UTC (rev 8749)
@@ -26,15 +26,13 @@
Ada.Numerics.Long_Elementary_Functions,
Ada.Strings,
Ada.Strings.Fixed,
- PLplot,
- PLplot_Auxiliary;
+ PLplot;
use
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
Ada.Strings,
Ada.Strings.Fixed,
- PLplot,
- PLplot_Auxiliary;
+ PLplot;
-- COMMENT THIS LINE IF YOUR COMPILER DOES NOT INCLUDE THESE
-- DEFINITIONS, FOR EXAMPLE, IF IT IS NOT ADA 2005 WITH ANNEX G.3 COMPLIANCE.
Modified: trunk/examples/ada/xthick19a.adb.cmake
===================================================================
--- trunk/examples/ada/xthick19a.adb.cmake 2008-09-04 19:06:12 UTC (rev 8748)
+++ trunk/examples/ada/xthick19a.adb.cmake 2008-09-04 20:55:52 UTC (rev 8749)
@@ -24,13 +24,11 @@
with
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
- PLplot,
- PLplot_Auxiliary;
+ PLplot;
use
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
- PLplot,
- PLplot_Auxiliary;
+ PLplot;
-- COMMENT THIS LINE IF YOUR COMPILER DOES NOT INCLUDE THESE
-- DEFINITIONS, FOR EXAMPLE, IF IT IS NOT ADA 2005 WITH ANNEX G.3 COMPLIANCE.
@@ -43,7 +41,7 @@
-- This spec is necessary in order to enforce C calling conventions, used
-- in the callback by intervening C code.
- procedure mapform19(n : Integer; x, y : in out Real_Vector);
+ procedure mapform19(n : Integer; x, y : in out Map_Form_Constrained_Array);
pragma Convention(C, mapform19);
-- Defines specific coordinate transformation for example 19.
@@ -57,7 +55,7 @@
-- wrapper function inside Draw_Map and Draw_Latitude_Longitude that has the "correct" C
-- argument list, and then pass a pointer to _that_ when calling Draw_Map and
-- plmeridian.
- procedure mapform19(n : Integer; x, y : in out Real_Vector) is
+ procedure mapform19(n : Integer; x, y : in out Map_Form_Constrained_Array) is
xp, yp, radius : Long_Float;
begin
-- DO NOT use x'range for this loop because the C function which calls
Modified: trunk/examples/ada/xthick23a.adb.cmake
===================================================================
--- trunk/examples/ada/xthick23a.adb.cmake 2008-09-04 19:06:12 UTC (rev 8748)
+++ trunk/examples/ada/xthick23a.adb.cmake 2008-09-04 20:55:52 UTC (rev 8749)
@@ -29,8 +29,7 @@
Ada.Strings.Fixed,
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
- PLplot,
- PLplot_Auxiliary;
+ PLplot;
use
Ada.Text_IO,
Ada.Integer_Text_IO,
@@ -39,8 +38,7 @@
Ada.Strings.Fixed,
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
- PLplot,
- PLplot_Auxiliary;
+ PLplot;
-- COMMENT THIS LINE IF YOUR COMPILER DOES NOT INCLUDE THESE
-- DEFINITIONS, FOR EXAMPLE, IF IT IS NOT ADA 2005 WITH ANNEX G.3 COMPLIANCE.
Modified: trunk/examples/ada/xthick24a.adb.cmake
===================================================================
--- trunk/examples/ada/xthick24a.adb.cmake 2008-09-04 19:06:12 UTC (rev 8748)
+++ trunk/examples/ada/xthick24a.adb.cmake 2008-09-04 20:55:52 UTC (rev 8749)
@@ -21,11 +21,9 @@
-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
with
- PLplot,
- PLplot_Auxiliary;
+ PLplot;
use
- PLplot,
- PLplot_Auxiliary;
+ PLplot;
-- COMMENT THIS LINE IF YOUR COMPILER DOES NOT INCLUDE THESE
-- DEFINITIONS, FOR EXAMPLE, IF IT IS NOT ADA 2005 WITH ANNEX G.3 COMPLIANCE.
Modified: trunk/examples/ada/xthick25a.adb.cmake
===================================================================
--- trunk/examples/ada/xthick25a.adb.cmake 2008-09-04 19:06:12 UTC (rev 8748)
+++ trunk/examples/ada/xthick25a.adb.cmake 2008-09-04 20:55:52 UTC (rev 8749)
@@ -21,11 +21,9 @@
-- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
with
- PLplot,
- PLplot_Auxiliary;
+ PLplot;
use
- PLplot,
- PLplot_Auxiliary;
+ PLplot;
-- COMMENT THIS LINE IF YOUR COMPILER DOES NOT INCLUDE THESE
-- DEFINITIONS, FOR EXAMPLE, IF IT IS NOT ADA 2005 WITH ANNEX G.3 COMPLIANCE.
Modified: trunk/examples/ada/xthick26a.adb.cmake
===================================================================
--- trunk/examples/ada/xthick26a.adb.cmake 2008-09-04 19:06:12 UTC (rev 8748)
+++ trunk/examples/ada/xthick26a.adb.cmake 2008-09-04 20:55:52 UTC (rev 8749)
@@ -57,13 +57,11 @@
with
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
- PLplot,
- PLplot_Auxiliary;
+ PLplot;
use
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
- PLplot,
- PLplot_Auxiliary;
+ PLplot;
-- COMMENT THIS LINE IF YOUR COMPILER DOES NOT INCLUDE THESE
-- DEFINITIONS, FOR EXAMPLE, IF IT IS NOT ADA 2005 WITH ANNEX G.3 COMPLIANCE.
Modified: trunk/examples/ada/xthick27a.adb.cmake
===================================================================
--- trunk/examples/ada/xthick27a.adb.cmake 2008-09-04 19:06:12 UTC (rev 8748)
+++ trunk/examples/ada/xthick27a.adb.cmake 2008-09-04 20:55:52 UTC (rev 8749)
@@ -22,12 +22,10 @@
with
Ada.Numerics.Long_Elementary_Functions,
- PLplot,
- PLplot_Auxiliary;
+ PLplot;
use
Ada.Numerics.Long_Elementary_Functions,
- PLplot,
- PLplot_Auxiliary;
+ PLplot;
-- COMMENT THIS LINE IF YOUR COMPILER DOES NOT INCLUDE THESE
-- DEFINITIONS, FOR EXAMPLE, IF IT IS NOT ADA 2005 WITH ANNEX G.3 COMPLIANCE.
Modified: trunk/examples/ada/xthick28a.adb.cmake
===================================================================
--- trunk/examples/ada/xthick28a.adb.cmake 2008-09-04 19:06:12 UTC (rev 8748)
+++ trunk/examples/ada/xthick28a.adb.cmake 2008-09-04 20:55:52 UTC (rev 8749)
@@ -23,13 +23,11 @@
with
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
- PLplot,
- PLplot_Auxiliary;
+ PLplot;
use
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
- PLplot,
- PLplot_Auxiliary;
+ PLplot;
-- COMMENT THIS LINE IF YOUR COMPILER DOES NOT INCLUDE THESE
-- DEFINITIONS, FOR EXAMPLE, IF IT IS NOT ADA 2005 WITH ANNEX G.3 COMPLIANCE.
Modified: trunk/examples/ada/xthick29a.adb.cmake
===================================================================
--- trunk/examples/ada/xthick29a.adb.cmake 2008-09-04 19:06:12 UTC (rev 8748)
+++ trunk/examples/ada/xthick29a.adb.cmake 2008-09-04 20:55:52 UTC (rev 8749)
@@ -24,14 +24,12 @@
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
Ada.Calendar,
- PLplot,
- PLplot_Auxiliary;
+ PLplot;
use
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
Ada.Calendar,
- PLplot,
- PLplot_Auxiliary;
+ PLplot;
-- COMMENT THIS LINE IF YOUR COMPILER DOES NOT INCLUDE THESE
-- DEFINITIONS, FOR EXAMPLE, IF IT IS NOT ADA 2005 WITH ANNEX G.3 COMPLIANCE.
Modified: trunk/examples/ada/xthick30a.adb.cmake
===================================================================
--- trunk/examples/ada/xthick30a.adb.cmake 2008-09-04 19:06:12 UTC (rev 8748)
+++ trunk/examples/ada/xthick30a.adb.cmake 2008-09-04 20:55:52 UTC (rev 8749)
@@ -24,14 +24,12 @@
System,
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
- PLplot,
- PLplot_Auxiliary;
+ PLplot;
use
System,
Ada.Numerics,
Ada.Numerics.Long_Elementary_Functions,
- PLplot,
- PLplot_Auxiliary;
+ PLplot;
-- COMMENT THIS LINE IF YOUR COMPILER DOES NOT INCLUDE THESE
-- DEFINITIONS, FOR EXAMPLE, IF IT IS NOT ADA 2005 WITH ANNEX G.3 COMPLIANCE.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|