MSVC warning fixes; patch by Stein Roger!

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@78405 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Daniel Dunbar 2009-08-07 20:50:09 +00:00
parent 2724915c17
commit 482cccd37e
2 changed files with 12 additions and 1 deletions

View File

@ -291,6 +291,12 @@ GenericValue Interpreter::callExternalFunction(Function *F,
//===----------------------------------------------------------------------===//
// Functions "exported" to the running application...
//
// Visual Studio warns about returning GenericValue in extern "C" linkage
#ifdef _MSC_VER
#pragma warning(disable : 4190)
#endif
extern "C" { // Don't add C++ manglings to llvm mangling :)
// void atexit(Function*)
@ -539,6 +545,11 @@ GenericValue lle_X_fprintf(const FunctionType *FT,
} // End extern "C"
// Done with externals; turn the warning back on
#ifdef _MSC_VER
#pragma warning(default: 4190)
#endif
void Interpreter::initializeExternalFunctions() {
sys::ScopedLock Writer(*FunctionsLock);

View File

@ -129,7 +129,7 @@ int main(int argc, char **argv) {
errs() << "Tool execution error: " << TEE.what() << '\n';
} catch (const std::string& msg) {
errs() << argv[0] << ": " << msg << "\n";
} catch (const std::bad_alloc &e) {
} catch (const std::bad_alloc&) {
errs() << "Oh no, a bugpoint process ran out of memory!\n"
"To increase the allocation limits for bugpoint child\n"
"processes, use the -mlimit option.\n";