Mercurial > hg > truffle

comparison src/share/vm/code/compressedStream.cpp @ 2000: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 f95d63e2154a
children 47bc9800972c
comparison
equal deleted inserted replaced
1998:0d4395745860 2000:5fa559508216
195 // for this block (a matching directive turns it back on later). 195 // for this block (a matching directive turns it back on later).
196 // These directives can be removed once the MS VS.NET 2005 196 // These directives can be removed once the MS VS.NET 2005
197 // compiler stack overflow is fixed. 197 // compiler stack overflow is fixed.
198 #if _MSC_VER >=1400 && !defined(_WIN64) 198 #if _MSC_VER >=1400 && !defined(_WIN64)
199 #pragma optimize("", off) 199 #pragma optimize("", off)
200 #pragma warning(disable: 4748)
200 #endif 201 #endif
201 202
202 // generator for an "interesting" set of critical values 203 // generator for an "interesting" set of critical values
203 enum { stretch_limit = (1<<16) * (64-16+1) }; 204 enum { stretch_limit = (1<<16) * (64-16+1) };
204 static jlong stretch(jint x, int bits) { 205 static jlong stretch(jint x, int bits) {
274 guarantee(length == length2, "bad length"); 275 guarantee(length == length2, "bad length");
275 guarantee(fails == 0, "test failures"); 276 guarantee(fails == 0, "test failures");
276 } 277 }
277 278
278 #if _MSC_VER >=1400 && !defined(_WIN64) 279 #if _MSC_VER >=1400 && !defined(_WIN64)
280 #pragma warning(default: 4748)
279 #pragma optimize("", on) 281 #pragma optimize("", on)
280 #endif 282 #endif
281 283
282 #endif // PRODUCT 284 #endif // PRODUCT