# HG changeset patch
# User wenzelm
# Date 1269296455 -3600
# Node ID 4008220110886e467917067ea5d462f5a1a9b88f
# Parent  3d699b736ff4ca63e29718f5e8d22708e97368f9# Parent  a4ed7aaa7d035b34007d285f73612dd241388a5c
merged

diff -r 3d699b736ff4 -r 400822011088 src/HOL/Predicate_Compile.thy
--- a/src/HOL/Predicate_Compile.thy	Mon Mar 22 15:05:20 2010 -0700
+++ b/src/HOL/Predicate_Compile.thy	Mon Mar 22 23:20:55 2010 +0100
@@ -1,4 +1,3 @@
-
 (*  Title:      HOL/Predicate_Compile.thy
     Author:     Stefan Berghofer, Lukas Bulwahn, Florian Haftmann, TU Muenchen
 *)
diff -r 3d699b736ff4 -r 400822011088 src/HOL/Tools/Datatype/datatype_codegen.ML
--- a/src/HOL/Tools/Datatype/datatype_codegen.ML	Mon Mar 22 15:05:20 2010 -0700
+++ b/src/HOL/Tools/Datatype/datatype_codegen.ML	Mon Mar 22 23:20:55 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;