From 4b34d5c523e800f116cb4f6b28a199630f2f7cda Mon Sep 17 00:00:00 2001 From: Anton Lavrik Date: Mon, 12 Feb 2018 23:21:04 -0800 Subject: [PATCH] More tweaks for OCaml 4.06 --- README.md | 2 +- examples/custom-types/Makefile | 2 +- examples/custom-types/piqirun_custom.ml | 9 --------- opam | 2 +- 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index 83bbec2..6b5c31a 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ Installation ### Installing using OPAM -In order to install Piqi using [OPAM](http://opam.ocamlpro.com/), run the +In order to install Piqi using [OPAM](https://opam.ocaml.org/), run the following command: opam install piqi diff --git a/examples/custom-types/Makefile b/examples/custom-types/Makefile index 6b9fdc4..8fccf00 100644 --- a/examples/custom-types/Makefile +++ b/examples/custom-types/Makefile @@ -11,7 +11,7 @@ SOURCES = \ export OCAMLPATH := ../..:$(OCAMLPATH) -PACKS = piqirun.pb #num +PACKS = piqirun.pb num PIQI_FILES = example.piqi skvl.piqi diff --git a/examples/custom-types/piqirun_custom.ml b/examples/custom-types/piqirun_custom.ml index a1637ca..5093c2b 100644 --- a/examples/custom-types/piqirun_custom.ml +++ b/examples/custom-types/piqirun_custom.ml @@ -19,19 +19,10 @@ let nativeint_to_int: nativeint -> int = Nativeint.to_int (* mapping OCaml big_int to Piqi string (by representing number as a decimal * string) *) -(* -(* Used to work with OCaml < 4.06 -- commenting out for now; XXX: support num | - * base-num as test dependency *) type bigint = Big_int.big_int let bigint_of_string: string -> bigint = Big_int.big_int_of_string let bigint_to_string: bigint -> string = Big_int.string_of_big_int -*) -type bigint = string - -let bigint_of_string (x: string) :bigint = x -let bigint_to_string (x: bigint) :string = x - (* diff --git a/opam b/opam index 592c9b1..4e5ed60 100644 --- a/opam +++ b/opam @@ -18,6 +18,6 @@ available: [ ocaml-version >= "4.02.0" ] depends: [ "ocamlfind" "piqilib" - "base-bytes" + "num" {build-test} ] dev-repo: "git://github.com/alavrik/piqi-ocaml"