Merge
authormikejwre
Wed, 19 May 2010 20:16:16 -0700
changeset 5440 84ace44cf876
parent 5438 e0e362d79bea (current diff)
parent 5439 d4101ea993e5 (diff)
child 5441 0b5f2ed67126
Merge
hotspot/src/share/vm/interpreter/bytecodes.cpp
--- a/hotspot/src/share/vm/interpreter/bytecodes.cpp	Tue May 18 14:10:01 2010 -0700
+++ b/hotspot/src/share/vm/interpreter/bytecodes.cpp	Wed May 19 20:16:16 2010 -0700
@@ -26,11 +26,13 @@
 #include "incls/_bytecodes.cpp.incl"
 
 
+#if defined(WIN32) && (defined(_MSC_VER) && (_MSC_VER < 1600))
 // Windows AMD64 Compiler Hangs compiling this file
 // unless optimization is off
 #ifdef _M_AMD64
 #pragma optimize ("", off)
 #endif
+#endif
 
 
 bool            Bytecodes::_is_initialized = false;