Merge
authorzgu
Wed, 27 Mar 2013 22:05:21 -0700
changeset 16595 672d098c1bcc
parent 16592 38de36b16add (current diff)
parent 16594 e62fc49806d9 (diff)
child 16597 e6fde43d473e
Merge
--- a/hotspot/src/share/vm/services/memTracker.hpp	Wed Mar 27 16:31:00 2013 -0700
+++ b/hotspot/src/share/vm/services/memTracker.hpp	Wed Mar 27 22:05:21 2013 -0700
@@ -86,13 +86,13 @@
 
    static inline void set_autoShutdown(bool value) { }
    static void shutdown(ShutdownReason reason) { }
-   static inline bool shutdown_in_progress() {  }
+   static inline bool shutdown_in_progress() { return false; }
    static bool print_memory_usage(BaselineOutputer& out, size_t unit,
-            bool summary_only = true) { }
+            bool summary_only = true) { return false; }
    static bool compare_memory_usage(BaselineOutputer& out, size_t unit,
-            bool summary_only = true) { }
+            bool summary_only = true) { return false; }
 
-   static bool wbtest_wait_for_data_merge() { }
+   static bool wbtest_wait_for_data_merge() { return false; }
 
    static inline void sync() { }
    static inline void thread_exiting(JavaThread* thread) { }