Mercurial > hg > openjdk > hsx20

changeset 1904:5fa559508216

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7007229: Fix warnings with VS2010 in compressedStream.cpp Summary: An interference between a fix for 6993125 and disabled optimization in compressedStream.cpp produces a warning with VS2010. Disable the warning for the code fragment for which the optimizations are disabled. Reviewed-by: kvn
author iveresov
date Wed, 15 Dec 2010 20:43:36 -0800
parents 0d4395745860
children f9c511aae070
files src/share/vm/code/compressedStream.cpp
diffstat 1 files changed, 2 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/vm/code/compressedStream.cpp	Fri Dec 10 18:05:39 2010 -0800
+++ b/src/share/vm/code/compressedStream.cpp	Wed Dec 15 20:43:36 2010 -0800
@@ -197,6 +197,7 @@
 // compiler stack overflow is fixed.
 #if _MSC_VER >=1400 && !defined(_WIN64)
 #pragma optimize("", off)
+#pragma warning(disable: 4748)
 #endif
 
 // generator for an "interesting" set of critical values
@@ -276,6 +277,7 @@
 }
 
 #if _MSC_VER >=1400 && !defined(_WIN64)
+#pragma warning(default: 4748)
 #pragma optimize("", on)
 #endif