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

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

Revision: 8736
          http://plplot.svn.sourceforge.net/plplot/?rev=8736&view=rev
Author:   airwin
Date:     2008-09-01 01:01:26 +0000 (Mon, 01 Sep 2008)

Log Message:
-----------
AWI for Hezekiah M. Carty. Update example 23 to bring in line with recent
changes to the pl[sg]fci unsigned integer arguments.

These changes work fine on my (and Hez's) 64-bit systems, and in
anticipation they will also work on 32-bit systems I have added ocaml
example 23 again to the list of examples built and tested in the build tree.

Modified Paths:
--------------
    trunk/examples/ocaml/CMakeLists.txt
    trunk/examples/ocaml/x23.ml
    trunk/plplot_test/test_ocaml.sh.in

Modified: trunk/examples/ocaml/CMakeLists.txt
===================================================================
--- trunk/examples/ocaml/CMakeLists.txt	2008-09-01 00:56:41 UTC (rev 8735)
+++ trunk/examples/ocaml/CMakeLists.txt	2008-09-01 01:01:26 UTC (rev 8736)
@@ -41,6 +41,7 @@
   "20"
   "21"
   "22"
+  "23"
   "24"
   "25"
   "26"

Modified: trunk/examples/ocaml/x23.ml
===================================================================
--- trunk/examples/ocaml/x23.ml	2008-09-01 00:56:41 UTC (rev 8735)
+++ trunk/examples/ocaml/x23.ml	2008-09-01 01:01:26 UTC (rev 8736)
@@ -164,36 +164,36 @@
 let fci_combinations = 30
 
 let fci = [|
-  0x80000000;
-  0x80000001;
-  0x80000002;
-  0x80000003;
-  0x80000004;
-  0x80000010;
-  0x80000011;
-  0x80000012;
-  0x80000013;
-  0x80000014;
-  0x80000020;
-  0x80000021;
-  0x80000022;
-  0x80000023;
-  0x80000024;
-  0x80000100;
-  0x80000101;
-  0x80000102;
-  0x80000103;
-  0x80000104;
-  0x80000110;
-  0x80000111;
-  0x80000112;
-  0x80000113;
-  0x80000114;
-  0x80000120;
-  0x80000121;
-  0x80000122;
-  0x80000123;
-  0x80000124;
+  0x80000000L;
+  0x80000001L;
+  0x80000002L;
+  0x80000003L;
+  0x80000004L;
+  0x80000010L;
+  0x80000011L;
+  0x80000012L;
+  0x80000013L;
+  0x80000014L;
+  0x80000020L;
+  0x80000021L;
+  0x80000022L;
+  0x80000023L;
+  0x80000024L;
+  0x80000100L;
+  0x80000101L;
+  0x80000102L;
+  0x80000103L;
+  0x80000104L;
+  0x80000110L;
+  0x80000111L;
+  0x80000112L;
+  0x80000113L;
+  0x80000114L;
+  0x80000120L;
+  0x80000121L;
+  0x80000122L;
+  0x80000123L;
+  0x80000124L;
 |]
 
 let family = [|
@@ -290,7 +290,7 @@
     pladv 0;
     plvpor 0.02 0.98 0.02 0.90;
     plwind 0.0 1.0 0.0 1.0;
-    plsfci 0;
+    plsfci 0L;
     let () =
       match page with
           11 ->
@@ -332,7 +332,7 @@
                 weight.(weight_index);
           | 13 ->
               sprintf
-                "Page 14, %s, %s, %s:  #<0x%x>The quick brown fox jumps over the lazy dog"
+                "Page 14, %s, %s, %s:  #<0x%Lx>The quick brown fox jumps over the lazy dog"
                 family.(family_index)
                 style.(style_index)
                 weight.(weight_index)

Modified: trunk/plplot_test/test_ocaml.sh.in
===================================================================
--- trunk/plplot_test/test_ocaml.sh.in	2008-09-01 00:56:41 UTC (rev 8735)
+++ trunk/plplot_test/test_ocaml.sh.in	2008-09-01 01:01:26 UTC (rev 8736)
@@ -23,7 +23,7 @@
 # $options, and possibly $verbose_test defined.
 
 # Do the standard non-interactive examples.
-for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 15 16 18 19 20 21 22 24 25 26 27 28 29 30; do
+for index in 01 02 03 04 05 06 07 08 09 10 11 12 13 15 16 18 19 20 21 22 23 24 25 26 27 28 29 30; do
   if [ "$verbose_test" ]; then
     echo "x${index}ocaml"
   fi


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