Fixes to compile with GCC 3.2
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@5134 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/ExecutionEngine/ExecutionEngine.cpp b/lib/ExecutionEngine/ExecutionEngine.cpp
index 996afe4..456f682 100644
--- a/lib/ExecutionEngine/ExecutionEngine.cpp
+++ b/lib/ExecutionEngine/ExecutionEngine.cpp
@@ -56,7 +56,7 @@
}
break;
default:
- cout << "ERROR: Constant unimp for type: " << C->getType() << "\n";
+ std::cout << "ERROR: Constant unimp for type: " << C->getType() << "\n";
}
return Result;
}
@@ -92,7 +92,7 @@
Ptr->Untyped[7] = (Val.ULongVal >> 56) & 255;
break;
default:
- cout << "Cannot store value of type " << Ty << "!\n";
+ std::cout << "Cannot store value of type " << Ty << "!\n";
}
} else {
switch (Ty->getPrimitiveID()) {
@@ -123,7 +123,7 @@
Ptr->Untyped[0] = (Val.ULongVal >> 56) & 255;
break;
default:
- cout << "Cannot store value of type " << Ty << "!\n";
+ std::cout << "Cannot store value of type " << Ty << "!\n";
}
}
}
@@ -141,7 +141,7 @@
switch (Init->getType()->getPrimitiveID()) {
case Type::ArrayTyID: {
const ConstantArray *CPA = cast<ConstantArray>(Init);
- const vector<Use> &Val = CPA->getValues();
+ const std::vector<Use> &Val = CPA->getValues();
unsigned ElementSize =
getTargetData().getTypeSize(cast<ArrayType>(CPA->getType())->getElementType());
for (unsigned i = 0; i < Val.size(); ++i)
@@ -153,7 +153,7 @@
const ConstantStruct *CPS = cast<ConstantStruct>(Init);
const StructLayout *SL =
getTargetData().getStructLayout(cast<StructType>(CPS->getType()));
- const vector<Use> &Val = CPS->getValues();
+ const std::vector<Use> &Val = CPS->getValues();
for (unsigned i = 0; i < Val.size(); ++i)
InitializeMemory(cast<Constant>(Val[i].get()),
(char*)Addr+SL->MemberOffsets[i]);
diff --git a/tools/lli/lli.cpp b/tools/lli/lli.cpp
index be6ed11..73052c0 100644
--- a/tools/lli/lli.cpp
+++ b/tools/lli/lli.cpp
@@ -51,17 +51,17 @@
" llvm interpreter & dynamic compiler\n");
// Load the bytecode...
- string ErrorMsg;
+ std::string ErrorMsg;
Module *M = ParseBytecodeFile(InputFile, &ErrorMsg);
if (M == 0) {
- cout << "Error parsing '" << InputFile << "': "
- << ErrorMsg << "\n";
+ std::cout << "Error parsing '" << InputFile << "': "
+ << ErrorMsg << "\n";
exit(1);
}
#if 0
// Link in the runtime library for LLI...
- string RuntimeLib = getCurrentExecutablePath();
+ std::string RuntimeLib = getCurrentExecutablePath();
if (!RuntimeLib.empty()) RuntimeLib += "/";
RuntimeLib += "RuntimeLib.bc";