# HG changeset patch
# User pliden
# Date 1441109873 -7200
# Node ID 6dad23e1c89d8535eb2d097f38b55ba67cc5edb6
# Parent  be685a5356a4345c54fdfa9aeee0448a9556d3f5# Parent  2381355ef90a123ab1c2e5622c305f8dda8f4bc6
Merge

diff -r be685a5356a4 -r 6dad23e1c89d src/share/vm/gc/g1/g1CollectorPolicy.hpp
--- a/src/share/vm/gc/g1/g1CollectorPolicy.hpp	Tue Sep 01 10:53:29 2015 +0200
+++ b/src/share/vm/gc/g1/g1CollectorPolicy.hpp	Tue Sep 01 14:17:53 2015 +0200
@@ -604,10 +604,6 @@
 
   virtual G1CollectorPolicy* as_g1_policy() { return this; }
 
-  virtual CollectorPolicy::Name kind() {
-    return CollectorPolicy::G1CollectorPolicyKind;
-  }
-
   G1CollectorState* collector_state();
 
   G1GCPhaseTimes* phase_times() const { return _phase_times; }
diff -r be685a5356a4 -r 6dad23e1c89d src/share/vm/gc/shared/collectorPolicy.hpp
--- a/src/share/vm/gc/shared/collectorPolicy.hpp	Tue Sep 01 10:53:29 2015 +0200
+++ b/src/share/vm/gc/shared/collectorPolicy.hpp	Tue Sep 01 14:17:53 2015 +0200
@@ -111,13 +111,6 @@
   size_t max_heap_byte_size()     { return _max_heap_byte_size; }
   size_t min_heap_byte_size()     { return _min_heap_byte_size; }
 
-  enum Name {
-    CollectorPolicyKind,
-    GenCollectorPolicyKind,
-    ConcurrentMarkSweepPolicyKind,
-    G1CollectorPolicyKind
-  };
-
   AdaptiveSizePolicy* size_policy() { return _size_policy; }
   bool should_clear_all_soft_refs() { return _should_clear_all_soft_refs; }
   void set_should_clear_all_soft_refs(bool v) { _should_clear_all_soft_refs = v; }
@@ -180,10 +173,6 @@
     ShouldNotReachHere();
   }
 
-  virtual CollectorPolicy::Name kind() {
-    return CollectorPolicy::CollectorPolicyKind;
-  }
-
   // Do any updates required to global flags that are due to heap initialization
   // changes
   virtual void post_heap_initialize() = 0;
@@ -296,10 +285,6 @@
   virtual void post_heap_initialize() {
     assert(_max_young_size == MaxNewSize, "Should be taken care of by initialize_size_info");
   }
-
-  virtual CollectorPolicy::Name kind() {
-    return CollectorPolicy::GenCollectorPolicyKind;
-  }
 };
 
 class MarkSweepPolicy : public GenCollectorPolicy {