diff src/share/vm/utilities/ostream.hpp @ 11198:1e6d5dec4a4e

Merge.
author Christian Humer <christian.humer@gmail.com>
date Mon, 05 Aug 2013 13:20:06 +0200
parents dbc0b5dc08f5
children 621eda7235d2
line wrap: on
line diff
--- a/src/share/vm/utilities/ostream.hpp	Thu Aug 01 21:34:57 2013 +0200
+++ b/src/share/vm/utilities/ostream.hpp	Mon Aug 05 13:20:06 2013 +0200
@@ -28,6 +28,8 @@
 #include "memory/allocation.hpp"
 #include "runtime/timer.hpp"
 
+DEBUG_ONLY(class ResourceMark;)
+
 // Output streams for printing
 //
 // Printing guidelines:
@@ -177,6 +179,7 @@
   size_t buffer_pos;
   size_t buffer_length;
   bool   buffer_fixed;
+  DEBUG_ONLY(ResourceMark* rm;)
  public:
   stringStream(size_t initial_bufsize = 256);
   stringStream(char* fixed_buffer, size_t fixed_buffer_size);