tomprince

diff --git a/Instances.v b/Instances.v
index 1a2e08f..ef9a2e6 100644
--- a/Instances.v
+++ b/Instances.v
@@ -13,8 +13,8 @@
 Require Export  AAC.
 
 Module Peano.
-  Require Import Arith NArith Max.
-  Program Instance aac_plus : @Op_AC nat eq plus 0 := @Build_Op_AC nat (@eq nat) plus 0  _ plus_0_l plus_assoc plus_comm.

tomprince

#include <cstdio>

template <class T>
class B {
public:
	virtual void do_stuff() { printf("B stuff.\n"); }
	virtual ~B() { printf("~B stuff.\n"); }
};

template <class T>

tomprince

diff --git a/library/DFProcess-linux-SHM.cpp b/library/DFProcess-linux-SHM.cpp
index 79cf17e..db161bc 100644
--- a/library/DFProcess-linux-SHM.cpp
+++ b/library/DFProcess-linux-SHM.cpp
@@ -22,7 +22,7 @@ must not be misrepresented as being the original software.
 distribution.
 */
 #include "Internal.h"
-#include "dfhack/DFProcess.h"
+#include "ProcessInternal.h"

tomprince

diff --git a/AAC_coq.ml b/AAC_coq.ml
index b3ee180..ea1601e 100644
--- a/AAC_coq.ml
+++ b/AAC_coq.ml
@@ -27,7 +27,7 @@ let init_constant dir s = find_constant contrib_name dir s
    in the goal *)
 let nowhere =
   { Tacexpr.onhyps = Some [];
-    Tacexpr.concl_occs = Rawterm.no_occurrences_expr
+    Tacexpr.concl_occs = Glob_term.no_occurrences_expr

tomprince

diff --git a/master/buildbot/status/web/changes.py b/master/buildbot/status/web/changes.py
index 9670237..65d2421 100644
--- a/master/buildbot/status/web/changes.py
+++ b/master/buildbot/status/web/changes.py
@@ -17,6 +17,8 @@
 from zope.interface import implements
 from twisted.python import components
 from twisted.web.error import NoResource
+from twisted.web import resource
+from twisted.web.server import NOT_DONE_YET

tomprince

diff --git a/gemrb/GUIScripts/GUIClasses.py b/gemrb/GUIScripts/GUIClasses.py
index 6f1b412..8e5fb67 100644
--- a/gemrb/GUIScripts/GUIClasses.py
+++ b/gemrb/GUIScripts/GUIClasses.py
@@ -56,7 +56,6 @@ class GWindow:
     'SetPos': _GemRB.Window_SetPos,
     'HasControl': _GemRB.Window_HasControl,
     'DeleteControl': _GemRB.Window_DeleteControl,
-    'Unload': _GemRB.Window_Unload,
     'SetupEquipmentIcons': _GemRB.Window_SetupEquipmentIcons,

tomprince

Inductive SumList : nat -> Type :=
  | s_nil : SumList 0
  | s_cons : forall n {m}, SumList m -> SumList (m + n).

Require Import List Compare_dec.
Fixpoint prefix_sum_lists (l : list nat) : list {n: nat & SumList n} :=
   match l with
   | nil => nil
   | n :: l0 =>
       existT SumList n (s_cons n s_nil)

tomprince

diff --git a/master/buildbot/process/build.py b/master/buildbot/process/build.py
index 3ff063d..e0f533f 100644
--- a/master/buildbot/process/build.py
+++ b/master/buildbot/process/build.py
@@ -183,6 +183,12 @@ class Build:
         # object that came from the config, and get its properties
         buildslave_properties = slavebuilder.slave.properties
         self.getProperties().updateFromProperties(buildslave_properties)
+        try:
+            from twisted.python.reflect import namedModule

tomprince

diff --git a/gemrb/core/EffectQueue.cpp b/gemrb/core/EffectQueue.cpp
index 38d9780..582b54c 100644
--- a/gemrb/core/EffectQueue.cpp
+++ b/gemrb/core/EffectQueue.cpp
@@ -172,7 +172,7 @@ int find_effect(const void *a, const void *b)
 	return stricmp((const char *) a,((const EffectRef *) b)->Name);
 }
 
-static EffectRef* FindEffect(const char* effectname)
+static EffectRef2* FindEffect(const char* effectname)

tomprince

Ltac read f :=
  match f with
  | true => constr :true
  | false => constr :false
  | _ => constr :tt 
  end. 

Lemma test : true = true. 
let v := read true in idtac v.