diff options
| author | Guillaume Melquiond | 2016-01-06 14:22:34 +0100 |
|---|---|---|
| committer | Guillaume Melquiond | 2016-01-06 14:22:34 +0100 |
| commit | 1afa595012bbaf5fb89398b355f16159e1af399b (patch) | |
| tree | 255cc594c736debd1cbd53b92906e1fa10d80de5 /checker | |
| parent | 7ca0319268c2c6912e08c53deb742d5f7631e210 (diff) | |
| parent | 8b5d02d8706f99015c2ce8efcad32b7af228dd53 (diff) | |
Merge remote-tracking branch 'origin/v8.5' into trunk
Conflicts:
lib/cSig.mli
Diffstat (limited to 'checker')
| -rw-r--r-- | checker/check.mllib | 4 | ||||
| -rw-r--r-- | checker/univ.mli | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/checker/check.mllib b/checker/check.mllib index a029b0245c..3725989e87 100644 --- a/checker/check.mllib +++ b/checker/check.mllib @@ -18,6 +18,8 @@ Flags Control Pp_control Loc +CList +CString Serialize Stateid Feedback @@ -26,8 +28,6 @@ Segmenttree Unicodetable Unicode CObj -CList -CString CArray CStack Util diff --git a/checker/univ.mli b/checker/univ.mli index 02c1bbdb91..f3216feac4 100644 --- a/checker/univ.mli +++ b/checker/univ.mli @@ -130,7 +130,7 @@ val check_constraints : constraints -> universes -> bool (** {6 Support for universe polymorphism } *) (** Polymorphic maps from universe levels to 'a *) -module LMap : Map.S with type key = universe_level +module LMap : CSig.MapS with type key = universe_level module LSet : CSig.SetS with type elt = universe_level type 'a universe_map = 'a LMap.t |