diff src/share/vm/memory/iterator.hpp @ 14909:4ca6dc0799b6

Backout jdk9 merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Tue, 01 Apr 2014 13:57:07 +0200
parents be0ac0e8f6e7
children 89152779163c
line wrap: on
line diff
--- a/src/share/vm/memory/iterator.hpp	Tue Apr 01 14:09:03 2014 +0200
+++ b/src/share/vm/memory/iterator.hpp	Tue Apr 01 13:57:07 2014 +0200
@@ -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
@@ -128,11 +128,6 @@
   virtual void do_klass(Klass* k) = 0;
 };
 
-class CLDClosure : public Closure {
- public:
-  virtual void do_cld(ClassLoaderData* cld) = 0;
-};
-
 class KlassToOopClosure : public KlassClosure {
   OopClosure* _oop_closure;
  public:
@@ -140,7 +135,7 @@
   virtual void do_klass(Klass* k);
 };
 
-class CLDToOopClosure : public CLDClosure {
+class CLDToOopClosure {
   OopClosure* _oop_closure;
   KlassToOopClosure _klass_closure;
   bool _must_claim_cld;