maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

MSVC warning fixes; patch by Stein Roger! 

llvm-svn: 78405
This commit is contained in:
Daniel Dunbar 2009-08-07 20:50:09 +00:00
parent 15b8037034
commit 86ec7bae4f
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
llvm/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp
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);

2
llvm/tools/bugpoint/bugpoint.cpp
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";