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

[<ai...@us...>]

Revision: 9043
          http://plplot.svn.sourceforge.net/plplot/?rev=9043&view=rev
Author:   airwin
Date:     2008-12-05 20:11:08 +0000 (Fri, 05 Dec 2008)

Log Message:
-----------
AWI for Hezekiah M. Carty.  Change the GRID_* names in the OCaml bindings to
PL_GRID_* to help avoid potential name clashes.

Modified Paths:
--------------
    trunk/bindings/ocaml/plplot.idl
    trunk/examples/ocaml/x21.ml

Modified: trunk/bindings/ocaml/plplot.idl
===================================================================
--- trunk/bindings/ocaml/plplot.idl	2008-12-05 19:37:35 UTC (rev 9042)
+++ trunk/bindings/ocaml/plplot.idl	2008-12-05 20:11:08 UTC (rev 9043)
@@ -133,14 +133,14 @@
     "let plunset_defined () = Callback.register \"caml_plplot_defined\" 0");
 quote(mli, "val plunset_defined : unit -> unit");
 
-// Hand-translated GRID_* flags for use with plgriddata
+// Hand-translated PL_GRID_* flags for use with plgriddata
 quote(mlmli, "type plplot_grid_method_type = \
-                GRID_CSA | \
-                GRID_DTLI | \
-                GRID_NNI | \
-                GRID_NNIDW | \
-                GRID_NNLI | \
-                GRID_NNAIDW");
+                PL_GRID_CSA | \
+                PL_GRID_DTLI | \
+                PL_GRID_NNI | \
+                PL_GRID_NNIDW | \
+                PL_GRID_NNLI | \
+                PL_GRID_NNAIDW");
 
 // Hand-translated PL_PARSE_* flags for use with plparseopts
 quote(mlmli, "type plplot_parse_method_type = \

Modified: trunk/examples/ocaml/x21.ml
===================================================================
--- trunk/examples/ocaml/x21.ml	2008-12-05 19:37:35 UTC (rev 9042)
+++ trunk/examples/ocaml/x21.ml	2008-12-05 20:11:08 UTC (rev 9043)
@@ -86,7 +86,8 @@
      related integer values are distinct.  The array provides a mapping to
      make conversion of this example from C easier. *)
   let alg_array =
-    [|GRID_CSA; GRID_DTLI; GRID_NNI; GRID_NNIDW; GRID_NNLI; GRID_NNAIDW|]
+    [|PL_GRID_CSA; PL_GRID_DTLI; PL_GRID_NNI; PL_GRID_NNIDW; PL_GRID_NNLI;
+      PL_GRID_NNAIDW|]
   in
   let title =
     [|
@@ -140,10 +141,10 @@
        * the neighbors is done.
        *)
       if
-        named_alg = GRID_CSA ||
-        named_alg = GRID_DTLI ||
-        named_alg = GRID_NNLI ||
-        named_alg = GRID_NNI
+        named_alg = PL_GRID_CSA ||
+        named_alg = PL_GRID_DTLI ||
+        named_alg = PL_GRID_NNLI ||
+        named_alg = PL_GRID_NNI
       then (
         for i = 0 to xp - 1 do
           for j = 0 to yp - 1 do


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