From 60354f102ab60c1df24ebb269b51e6664eb70aa3 Mon Sep 17 00:00:00 2001 From: Emilio Jesus Gallego Arias Date: Tue, 18 Oct 2016 15:52:11 +0200 Subject: [stm] Fix record field name clash. PR#173 introduced a record field name clash in `stm.mli`, with duplicate fields `start/stop` for the types `focus` and `static_block_declaration`. We fix by renaming the younger ones (as to minimize code incompatibilities), but other options are possible/could be preferred, however they would be quite more invasive so I think they should be postponed for the day the Stm API is cleaned up. --- stm/stm.mli | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'stm/stm.mli') diff --git a/stm/stm.mli b/stm/stm.mli index 37ec1f0a1..b8a2a3859 100644 --- a/stm/stm.mli +++ b/stm/stm.mli @@ -139,8 +139,8 @@ module QueryTask : AsyncTaskQueue.Task module DynBlockData : Dyn.S type static_block_declaration = { - start : Stateid.t; - stop : Stateid.t; + block_start : Stateid.t; + block_stop : Stateid.t; dynamic_switch : Stateid.t; carry_on_data : DynBlockData.t; } -- cgit v1.2.3