comparison src/share/vm/runtime/arguments.hpp @ 7482:989155e2d07a

Merge with hs25-b15.
author Thomas Wuerthinger <thomas.wuerthinger@oracle.com>
date Wed, 16 Jan 2013 01:34:24 +0100
parents 291ffc492eb6 e0ab18eafbde
children 5fc51c1ecdeb
comparison
equal deleted inserted replaced
7381:6761a8f854a4 7482:989155e2d07a
422 static jint parse(const JavaVMInitArgs* args); 422 static jint parse(const JavaVMInitArgs* args);
423 // Adjusts the arguments after the OS have adjusted the arguments 423 // Adjusts the arguments after the OS have adjusted the arguments
424 static jint adjust_after_os(); 424 static jint adjust_after_os();
425 // Check for consistency in the selection of the garbage collector. 425 // Check for consistency in the selection of the garbage collector.
426 static bool check_gc_consistency(); 426 static bool check_gc_consistency();
427 static void check_deprecated_gcs();
427 // Check consistecy or otherwise of VM argument settings 428 // Check consistecy or otherwise of VM argument settings
428 static bool check_vm_args_consistency(); 429 static bool check_vm_args_consistency();
429 // Check stack pages settings 430 // Check stack pages settings
430 static bool check_stack_pages(); 431 static bool check_stack_pages();
431 // Used by os_solaris 432 // Used by os_solaris