0001-Some-fixes-for-GCC-4.3.patch

From 50376df951f065a3d462b43a0fd6131eed5c1a0f Mon Sep 17 00:00:00 2001
From: Mitchell Riley <mitchell.v.riley@gmail.com>
Date: Wed, 8 Jul 2009 14:10:34 +1000
Subject: [PATCH] Some fixes for GCC 4.3

---
 vm/llvm/inline.cpp           |    4 ++--
 vm/llvm/inline_primitive.cpp |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/vm/llvm/inline.cpp b/vm/llvm/inline.cpp
index 39174f6..e4eabd7 100644
--- a/vm/llvm/inline.cpp
+++ b/vm/llvm/inline.cpp
@@ -148,12 +148,12 @@ namespace rubinius {
     case InstructionSequence::insn_push_int:
       val = ops_.constant(Fixnum::from(stream[1]));
       break;
-    case InstructionSequence::insn_push_literal:
+    case InstructionSequence::insn_push_literal: {
       Symbol* sym = try_as<Symbol>(cm->literals()->at(stream[1]));
       assert(sym);
 
       val = ops_.constant(sym);
-      break;
+      } break;
     case InstructionSequence::insn_meta_push_0:
       val = ops_.constant(Fixnum::from(0));
       break;
diff --git a/vm/llvm/inline_primitive.cpp b/vm/llvm/inline_primitive.cpp
index 19ba347..3ad873b 100644
--- a/vm/llvm/inline_primitive.cpp
+++ b/vm/llvm/inline_primitive.cpp
@@ -170,7 +170,7 @@ namespace rubinius {
   }
 
   bool Inliner::inline_primitive(Class* klass, CompiledMethod* cm, executor prim) {
-    char* inlined_prim = 0;
+    const char* inlined_prim = 0;
 
     if(prim == Primitives::tuple_at && count_ == 1) {
       inlined_prim = "tuple_at";
-- 
1.6.0.4