diff src/share/vm/utilities/vmError.hpp @ 11130:90d6c221d4e5

Merge
author jprovino
date Tue, 16 Jul 2013 12:20:08 -0400
parents 068b406e307f
children 38f750491293
line wrap: on
line diff
--- a/src/share/vm/utilities/vmError.hpp	Tue Jul 16 10:55:48 2013 -0400
+++ b/src/share/vm/utilities/vmError.hpp	Tue Jul 16 12:20:08 2013 -0400
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -96,6 +96,9 @@
     return (id != OOM_MALLOC_ERROR) && (id != OOM_MMAP_ERROR);
   }
 
+  static fdStream out;
+  static fdStream log; // error log used by VMError::report_and_die()
+
 public:
 
   // Constructor for crashes