diff --git a/opam b/opam index 89cd8efae6d2bbbb81848b0d3083e715c30d0a5a..a1dcd1b965977aae6b77bf4c6ddc8137433e5237 100644 --- a/opam +++ b/opam @@ -9,6 +9,6 @@ build: [make "-j%{jobs}%"] install: [make "install"] remove: ["rm" "-rf" "%{lib}%/coq/user-contrib/iris_examples"] depends: [ - "coq-iris" { (= "dev.2019-06-03.2.b368c861") | (= "dev") } + "coq-iris" { (= "dev.2019-06-04.2.322cdf37") | (= "dev") } "coq-autosubst" { = "dev.coq86" } ] diff --git a/theories/barrier/example_joining_existentials.v b/theories/barrier/example_joining_existentials.v index c30d462abf87f5396f8c7e3e7c41bb185977b1cc..40cd79b36b6d4486dfaa5e9ebf2410701e87e814 100644 --- a/theories/barrier/example_joining_existentials.v +++ b/theories/barrier/example_joining_existentials.v @@ -7,9 +7,9 @@ From iris_examples.barrier Require Import proof specification. Set Default Proof Using "Type". Definition one_shotR (Σ : gFunctors) (F : cFunctor) := - csumR (exclR unitC) (agreeR $ laterC $ F (iPreProp Σ)). + csumR (exclR unitC) (agreeR $ laterC $ F (iPreProp Σ) _). Definition Pending {Σ F} : one_shotR Σ F := Cinl (Excl ()). -Definition Shot {Σ} {F : cFunctor} (x : F (iProp Σ)) : one_shotR Σ F := +Definition Shot {Σ} {F : cFunctor} (x : F (iProp Σ) _) : one_shotR Σ F := Cinr $ to_agree $ Next $ cFunctor_map F (iProp_fold, iProp_unfold) x. Class oneShotG (Σ : gFunctors) (F : cFunctor) := @@ -28,7 +28,7 @@ Section proof. Local Set Default Proof Using "Type*". Context `{!heapG Σ, !barrierG Σ, !spawnG Σ, !oneShotG Σ F}. Context (N : namespace). -Local Notation X := (F (iProp Σ)). +Local Notation X := (F (iProp Σ) _). Definition barrier_res γ (Φ : X → iProp Σ) : iProp Σ := (∃ x, own γ (Shot x) ∗ Φ x)%I.