diff options
| author |  Guillaume Melquiond <guillaume.melquiond@inria.fr> | 2016-01-06 14:22:34 +0100 |
|---|---|---|
| committer | Guillaume Melquiond <guillaume.melquiond@inria.fr> | 2016-01-06 14:22:34 +0100 |
| commit | 1afa595012bbaf5fb89398b355f16159e1af399b (patch) | |
| tree | 255cc594c736debd1cbd53b92906e1fa10d80de5 /plugins/cc | |
| parent | 7ca0319268c2c6912e08c53deb742d5f7631e210 (diff) | |
| parent | 8b5d02d8706f99015c2ce8efcad32b7af228dd53 (diff) | |
Merge remote-tracking branch 'origin/v8.5' into trunk
Conflicts:
lib/cSig.mli
Diffstat (limited to 'plugins/cc')
| -rw-r--r-- | plugins/cc/ccalgo.mli | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/cc/ccalgo.mli b/plugins/cc/ccalgo.mli index 0dcf3a870..34c19958a 100644 --- a/plugins/cc/ccalgo.mli +++ b/plugins/cc/ccalgo.mli @@ -20,8 +20,8 @@ type pa_fun= fnargs:int} -module PafMap : Map.S with type key = pa_fun -module PacMap : Map.S with type key = pa_constructor +module PafMap : CSig.MapS with type key = pa_fun +module PacMap : CSig.MapS with type key = pa_constructor type cinfo = {ci_constr: pconstructor; (* inductive type *) @@ -185,7 +185,7 @@ val empty_forest: unit -> forest (*type pa_constructor -module PacMap:Map.S with type key=pa_constructor +module PacMap:CSig.MapS with type key=pa_constructor type term = Symb of Term.constr |