[llvm-commits] [llvm] r78405 - in /llvm/trunk: lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp tools/bugpoint/bugpoint.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Fri Aug  7 15:50:09 2009
New Revision: 78405

URL: http://llvm.org/viewvc/llvm-project?rev=78405&view=rev
Log:
MSVC warning fixes; patch by Stein Roger!

Modified:
    llvm/trunk/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp
    llvm/trunk/tools/bugpoint/bugpoint.cpp

Modified: llvm/trunk/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp?rev=78405&r1=78404&r2=78405&view=diff

==============================================================================
--- llvm/trunk/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp (original)
+++ llvm/trunk/lib/ExecutionEngine/Interpreter/ExternalFunctions.cpp Fri Aug  7 15:50:09 2009
@@ -291,6 +291,12 @@
 //===----------------------------------------------------------------------===//
 //  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 @@
 
 } // 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);

Modified: llvm/trunk/tools/bugpoint/bugpoint.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/bugpoint/bugpoint.cpp?rev=78405&r1=78404&r2=78405&view=diff

==============================================================================
--- llvm/trunk/tools/bugpoint/bugpoint.cpp (original)
+++ llvm/trunk/tools/bugpoint/bugpoint.cpp Fri Aug  7 15:50:09 2009
@@ -129,7 +129,7 @@
     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";