# HG changeset patch
# User zgu
# Date 1364414861 25200
# Node ID 26e0c03da92c5a280dacd9e9c7f8dfaef3da7887
# Parent  b5bae74160b7f7942e3db041c573c443ef064ffb# Parent  23f2d309e8556d1b33ad71bb7b71065f116d9dc1
Merge

diff -r 23f2d309e855 -r 26e0c03da92c src/share/vm/services/memTracker.hpp
--- a/src/share/vm/services/memTracker.hpp	Tue Mar 26 15:20:05 2013 -0700
+++ b/src/share/vm/services/memTracker.hpp	Wed Mar 27 13:07:41 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) { }