--- old/src/share/vm/gc/shared/genCollectedHeap.hpp	2015-10-21 17:28:36.000000000 +0200
+++ new/src/share/vm/gc/shared/genCollectedHeap.hpp	2015-10-21 17:28:35.000000000 +0200
@@ -380,9 +380,9 @@
   // the closure is applied to:
   // "SO_None" does none;
   enum ScanningOption {
-    SO_None                =  0x0,
-    SO_AllCodeCache        =  0x8,
-    SO_ScavengeCodeCache   = 0x10
+    SO_None              = 0x00,
+    SO_AllCodeCache      = 0x08,
+    SO_ScavengeCodeCache = 0x10
   };
 
  private:
@@ -395,16 +395,16 @@
                      CodeBlobClosure* code_roots);
 
  public:
-  static const bool StrongAndWeakRoots = false;
-  static const bool StrongRootsOnly    = true;
+  void young_process_roots(StrongRootsScope* scope,
+                           OopsInGenClosure* not_older_gens,
+                           OopsInGenClosure* older_gens,
+                           CLDClosure* cld_closure);
 
-  void gen_process_roots(StrongRootsScope* scope,
-                         GenerationType type,
+  void old_process_roots(StrongRootsScope* scope,
                          bool young_gen_as_roots,
                          ScanningOption so,
                          bool only_strong_roots,
                          OopsInGenClosure* not_older_gens,
-                         OopsInGenClosure* older_gens,
                          CLDClosure* cld_closure);
 
   // Apply "root_closure" to all the weak roots of the system.