comparison src/share/vm/runtime/arguments.cpp @ 8858:15c04fe93c18

Merge
author mgerdin
date Wed, 03 Apr 2013 09:19:02 +0200
parents 754c24457b20 aeb22fdaa14c
children 0c039865ef2b
comparison
equal deleted inserted replaced
8857:cc5b5976d72c 8858:15c04fe93c18
258 { "MinPermHeapExpansion", JDK_Version::jdk(8), JDK_Version::jdk(9) }, 258 { "MinPermHeapExpansion", JDK_Version::jdk(8), JDK_Version::jdk(9) },
259 { "MaxPermHeapExpansion", JDK_Version::jdk(8), JDK_Version::jdk(9) }, 259 { "MaxPermHeapExpansion", JDK_Version::jdk(8), JDK_Version::jdk(9) },
260 { "CMSRevisitStackSize", JDK_Version::jdk(8), JDK_Version::jdk(9) }, 260 { "CMSRevisitStackSize", JDK_Version::jdk(8), JDK_Version::jdk(9) },
261 { "PrintRevisitStats", JDK_Version::jdk(8), JDK_Version::jdk(9) }, 261 { "PrintRevisitStats", JDK_Version::jdk(8), JDK_Version::jdk(9) },
262 { "UseVectoredExceptions", JDK_Version::jdk(8), JDK_Version::jdk(9) }, 262 { "UseVectoredExceptions", JDK_Version::jdk(8), JDK_Version::jdk(9) },
263 { "UseSplitVerifier", JDK_Version::jdk(8), JDK_Version::jdk(9) },
263 #ifdef PRODUCT 264 #ifdef PRODUCT
264 { "DesiredMethodLimit", 265 { "DesiredMethodLimit",
265 JDK_Version::jdk_update(7, 2), JDK_Version::jdk(8) }, 266 JDK_Version::jdk_update(7, 2), JDK_Version::jdk(8) },
266 #endif // PRODUCT 267 #endif // PRODUCT
267 { NULL, JDK_Version(0), JDK_Version(0) } 268 { NULL, JDK_Version(0), JDK_Version(0) }