diff src/share/vm/utilities/events.hpp @ 10136:cc12becb22e7

Merge
author dcubed
date Sun, 21 Apr 2013 21:05:02 -0700
parents 5a9fa2ba85f0
children f9be75d21404
line wrap: on
line diff
--- a/src/share/vm/utilities/events.hpp	Sat Apr 20 19:02:11 2013 +0200
+++ b/src/share/vm/utilities/events.hpp	Sun Apr 21 21:05:02 2013 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2012, 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
@@ -69,7 +69,7 @@
 // semantics aren't appropriate.  The name is used as the label of the
 // log when it is dumped during a crash.
 template <class T> class EventLogBase : public EventLog {
-  template <class X> class EventRecord : public CHeapObj<mtInternal> {
+  template <class X> class EventRecord {
    public:
     double  timestamp;
     Thread* thread;