# HG changeset patch
# User Christian Kamm <kamm incasoftware de>
# Date 1218395363 -7200
# Node ID 017ca8645a1f70c452c06f10cb4ad894cd28dc6b
# Parent  bebc6099fb89a54d6850d7cc1d4a8e1f5d2c61b5
Make llvmdc work with llvm 2.4svn revision 54614. Breaks compatibility with llvm 2.3.

diff -r bebc6099fb89 -r 017ca8645a1f gen/irstate.cpp
--- a/gen/irstate.cpp	Sun Aug 10 18:35:27 2008 +0200
+++ b/gen/irstate.cpp	Sun Aug 10 21:09:23 2008 +0200
@@ -162,9 +162,9 @@
 
 //////////////////////////////////////////////////////////////////////////////////////////
 
-IRBuilder* IRBuilderHelper::operator->()
+IRBuilder<>* IRBuilderHelper::operator->()
 {
-    IRBuilder& b = state->scope().builder;
+    IRBuilder<>& b = state->scope().builder;
     assert(b.GetInsertBlock() != NULL);
     return &b;
 }
diff -r bebc6099fb89 -r 017ca8645a1f gen/irstate.h
--- a/gen/irstate.h	Sun Aug 10 18:35:27 2008 +0200
+++ b/gen/irstate.h	Sun Aug 10 21:09:23 2008 +0200
@@ -32,7 +32,7 @@
 {
     llvm::BasicBlock* begin;
     llvm::BasicBlock* end;
-    IRBuilder builder;
+    IRBuilder<> builder;
 
     IRScope();
     IRScope(llvm::BasicBlock* b, llvm::BasicBlock* e);
@@ -56,7 +56,7 @@
 struct IRBuilderHelper
 {
     IRState* state;
-    IRBuilder* operator->();
+    IRBuilder<>* operator->();
 };
 
 struct IRAsmStmt
diff -r bebc6099fb89 -r 017ca8645a1f gen/toobj.cpp
--- a/gen/toobj.cpp	Sun Aug 10 18:35:27 2008 +0200
+++ b/gen/toobj.cpp	Sun Aug 10 21:09:23 2008 +0200
@@ -229,7 +229,7 @@
     fn->setCallingConv(llvm::CallingConv::Fast);
 
     llvm::BasicBlock* bb = llvm::BasicBlock::Create("entry", fn);
-    IRBuilder builder(bb);
+    IRBuilder<> builder(bb);
 
     for (size_t i=0; i<n; i++) {
         llvm::Function* f = gIR->ctors[i]->ir.irFunc->func;
@@ -263,7 +263,7 @@
     fn->setCallingConv(llvm::CallingConv::Fast);
 
     llvm::BasicBlock* bb = llvm::BasicBlock::Create("entry", fn);
-    IRBuilder builder(bb);
+    IRBuilder<> builder(bb);
 
     for (size_t i=0; i<n; i++) {
         llvm::Function* f = gIR->dtors[i]->ir.irFunc->func;
@@ -297,7 +297,7 @@
     fn->setCallingConv(llvm::CallingConv::Fast);
 
     llvm::BasicBlock* bb = llvm::BasicBlock::Create("entry", fn);
-    IRBuilder builder(bb);
+    IRBuilder<> builder(bb);
 
     for (size_t i=0; i<n; i++) {
         llvm::Function* f = gIR->unitTests[i]->ir.irFunc->func;
@@ -343,7 +343,7 @@
 
     // make the function insert this moduleinfo as the beginning of the _Dmodule_ref linked list
     llvm::BasicBlock* bb = llvm::BasicBlock::Create("moduleinfoCtorEntry", ctor);
-    IRBuilder builder(bb);
+    IRBuilder<> builder(bb);
 
     // get current beginning
     LLValue* curbeg = builder.CreateLoad(mref, "current");