summaryrefslogtreecommitdiff
path: root/typing/typeclass.mli
diff options
context:
space:
mode:
authorJacques Garrigue <garrigue at math.nagoya-u.ac.jp>2010-04-08 03:58:41 +0000
committerJacques Garrigue <garrigue at math.nagoya-u.ac.jp>2010-04-08 03:58:41 +0000
commitee36e1d1c5fa2c90a86ae9b6a9a3f6d3666b4e2b (patch)
tree35b439e2c89eb0463944dd6611f567deff2a218b /typing/typeclass.mli
parentcfd555426d1d99c104669d05432f689f025ea374 (diff)
downloadocaml-ee36e1d1c5fa2c90a86ae9b6a9a3f6d3666b4e2b.tar.gz
merge branches/override
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@10250 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
Diffstat (limited to 'typing/typeclass.mli')
-rw-r--r--typing/typeclass.mli1
1 files changed, 1 insertions, 0 deletions
diff --git a/typing/typeclass.mli b/typing/typeclass.mli
index 20d2d32503..17ec69854f 100644
--- a/typing/typeclass.mli
+++ b/typing/typeclass.mli
@@ -75,6 +75,7 @@ type error =
Ident.t * Types.class_declaration * (type_expr * type_expr) list
| Final_self_clash of (type_expr * type_expr) list
| Mutability_mismatch of string * mutable_flag
+ | No_overriding of string * string
exception Error of Location.t * error