diff options
| author | Jacques Garrigue <garrigue at math.nagoya-u.ac.jp> | 2013-01-29 14:21:12 +0000 |
|---|---|---|
| committer | Jacques Garrigue <garrigue at math.nagoya-u.ac.jp> | 2013-01-29 14:21:12 +0000 |
| commit | 26e1ff7138c3e90e845fb278fc6283a166f1871f (patch) | |
| tree | d02a34c8baf030ed23102619fe541c888f85bf76 /typing/typeclass.mli | |
| parent | d327f16c33093540f99738cf195d51b736f5581c (diff) | |
| parent | 1430e90e89240309b1aea3a7ddd0270bb16707b8 (diff) | |
| download | ocaml-26e1ff7138c3e90e845fb278fc6283a166f1871f.tar.gz | |
Merge short-paths into a fresh branch of trunk.short-paths-4.01
Also fix a bit unification and subtyping errors.
You now need the flag -short-path to activate short paths.
git-svn-id: http://caml.inria.fr/svn/ocaml/branches/short-paths-4.01@13285 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'typing/typeclass.mli')
| -rw-r--r-- | typing/typeclass.mli | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/typing/typeclass.mli b/typing/typeclass.mli index 19a0a2aad8..c8f28013d6 100644 --- a/typing/typeclass.mli +++ b/typing/typeclass.mli @@ -104,6 +104,6 @@ type error = | Mutability_mismatch of string * mutable_flag | No_overriding of string * string -exception Error of Location.t * error +exception Error of Location.t * Env.t * error -val report_error : formatter -> error -> unit +val report_error : Env.t -> formatter -> error -> unit |