1.1 --- a/src/share/vm/runtime/arguments.hpp Fri Feb 27 09:52:36 2015 -0800
1.2 +++ b/src/share/vm/runtime/arguments.hpp Mon Mar 02 11:08:09 2015 +0100
1.3 @@ -466,8 +466,7 @@
1.4 static bool verify_MaxHeapFreeRatio(FormatBuffer<80>& err_msg, uintx max_heap_free_ratio);
1.5
1.6 // Check for consistency in the selection of the garbage collector.
1.7 - static bool check_gc_consistency_user(); // Check user-selected gc
1.8 - static inline bool check_gc_consistency_ergo(); // Check ergonomic-selected gc
1.9 + static bool check_gc_consistency(); // Check user-selected gc
1.10 static void check_deprecated_gcs();
1.11 static void check_deprecated_gc_flags();
1.12 // Check consistecy or otherwise of VM argument settings
1.13 @@ -615,8 +614,4 @@
1.14 UseParNewGC || UseSerialGC;
1.15 }
1.16
1.17 -bool Arguments::check_gc_consistency_ergo() {
1.18 - return check_gc_consistency_user();
1.19 -}
1.20 -
1.21 #endif // SHARE_VM_RUNTIME_ARGUMENTS_HPP
