Merging r258436:

[oota-llvm.git] / examples / BrainF / BrainF.h

diff --git a/examples/BrainF/BrainF.h b/examples/BrainF/BrainF.h
index d21d3bb8913923f763cb4ef897b5b8dbe513ee1f..15e9e0847141fa57b84e31c61eb58bfbfea4122e 100644 (file)
--- a/examples/BrainF/BrainF.h
+++ b/examples/BrainF/BrainF.h
@@ -15,9 +15,9 @@
 #ifndef BRAINF_H
 #define BRAINF_H
 
-#include "llvm/LLVMContext.h"
-#include "llvm/Module.h"
-#include "llvm/Support/IRBuilder.h"
+#include "llvm/IR/IRBuilder.h"
+#include "llvm/IR/LLVMContext.h"
+#include "llvm/IR/Module.h"
 
 using namespace llvm;
 
@@ -40,7 +40,7 @@ class BrainF {
     /// On error, it calls abort.
     /// The caller must delete the returned module.
     Module *parse(std::istream *in1, int mem, CompileFlags cf,
-                  const LLVMContext& C);
+                  LLVMContext& C);
 
   protected:
     /// The different symbols in the BrainF language
@@ -66,11 +66,12 @@ class BrainF {
     static const char *testreg;
 
     /// Put the brainf function preamble and other fixed pieces of code
-    void header(const LLVMContext& C);
+    void header(LLVMContext& C);
 
     /// The main loop for parsing.  It calls itself recursively
     /// to handle the depth of nesting of "[]".
-    void readloop(PHINode *phi, BasicBlock *oldbb, BasicBlock *testbb);
+    void readloop(PHINode *phi, BasicBlock *oldbb,
+                  BasicBlock *testbb, LLVMContext &Context);
 
     /// Constants during parsing
     int memtotal;