[vmkit-commits] [vmkit] r54681 - in /vmkit/trunk/lib: JnJVM/VMCore/JnjvmModule.cpp Mvm/Runtime/JIT.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Tue Aug 12 06:01:04 2008
New Revision: 54681

URL: http://llvm.org/viewvc/llvm-project?rev=54681&view=rev
Log:
Include LLVM runtime in its project's namespace.


Modified:
    vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp
    vmkit/trunk/lib/Mvm/Runtime/JIT.cpp

Modified: vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp?rev=54681&r1=54680&r2=54681&view=diff

==============================================================================
--- vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp (original)
+++ vmkit/trunk/lib/JnJVM/VMCore/JnjvmModule.cpp Tue Aug 12 06:01:04 2008
@@ -965,13 +965,16 @@
 
 #endif
 
-namespace llvm_runtime { 
-  #include "LLVMRuntime.inc"
+
+namespace jnjvm { 
+  namespace llvm_runtime { 
+    #include "LLVMRuntime.inc"
+  }
 }
 
 void JnjvmModule::initialise() {
   Module* module = this;
-  llvm_runtime::makeLLVMModuleContents(module);
+  jnjvm::llvm_runtime::makeLLVMModuleContents(module);
   
   VTType = module->getTypeByName("VT");
   

Modified: vmkit/trunk/lib/Mvm/Runtime/JIT.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/trunk/lib/Mvm/Runtime/JIT.cpp?rev=54681&r1=54680&r2=54681&view=diff

==============================================================================
--- vmkit/trunk/lib/Mvm/Runtime/JIT.cpp (original)
+++ vmkit/trunk/lib/Mvm/Runtime/JIT.cpp Tue Aug 12 06:01:04 2008
@@ -50,8 +50,10 @@
 
 extern "C" void __register_frame(void*);
 
-namespace llvm_runtime {
-  #include "LLVMRuntime.inc"
+namespace mvm {
+  namespace llvm_runtime {
+    #include "LLVMRuntime.inc"
+  }
 }
 
 void mvm::jit::initialise() {
@@ -67,7 +69,7 @@
   std::string str = executionEngine->getTargetData()->getStringRepresentation();
   module->setDataLayout(str);
   
-  llvm_runtime::makeLLVMModuleContents(module);
+  mvm::llvm_runtime::makeLLVMModuleContents(module);
   
   printFloatLLVM = module->getFunction("printFloat");
   printDoubleLLVM = module->getFunction("printDouble");