# HG changeset patch
# User wenzelm
# Date 1269295006 -3600
# Node ID a4ed7aaa7d035b34007d285f73612dd241388a5c
# Parent  12f09bf2c77fa2d89c83b1a897f2be74ffc16341# Parent  e810f73c8ee21d2cbaf5cdba59eef9d6973ee397
merged

diff -r 12f09bf2c77f -r a4ed7aaa7d03 src/HOL/Predicate_Compile.thy
--- a/src/HOL/Predicate_Compile.thy	Mon Mar 22 13:27:35 2010 -0700
+++ b/src/HOL/Predicate_Compile.thy	Mon Mar 22 22:56:46 2010 +0100
@@ -1,4 +1,3 @@
-
 (*  Title:      HOL/Predicate_Compile.thy
     Author:     Stefan Berghofer, Lukas Bulwahn, Florian Haftmann, TU Muenchen
 *)
diff -r 12f09bf2c77f -r a4ed7aaa7d03 src/HOL/Tools/Datatype/datatype_codegen.ML
--- a/src/HOL/Tools/Datatype/datatype_codegen.ML	Mon Mar 22 13:27:35 2010 -0700
+++ b/src/HOL/Tools/Datatype/datatype_codegen.ML	Mon Mar 22 22:56:46 2010 +0100
@@ -358,7 +358,7 @@
       [trueprop $ false_eq (t1, t2), trueprop $ false_eq (t2, t1)];
     val distincts = maps prep_distinct (snd (nth (Datatype_Prop.make_distincts [descr] vs) index));
     val refl = HOLogic.mk_Trueprop (true_eq (Free ("x", ty), Free ("x", ty)));
-    val simpset = Simplifier.context (ProofContext.init thy) (HOL_basic_ss addsimps 
+    val simpset = Simplifier.global_context thy (HOL_basic_ss addsimps 
       (map Simpdata.mk_eq (@{thm eq} :: @{thm eq_True} :: inject_thms @ distinct_thms)));
     fun prove prop = Skip_Proof.prove_global thy [] [] prop (K (ALLGOALS (simp_tac simpset)))
       |> Simpdata.mk_eq;