diff src/share/vm/memory/genCollectedHeap.hpp @ 6154:5142b5110214

Merge
author asaha
date Tue, 08 May 2012 07:29:27 -0700
parents b632e80fc9dc
children da91efe96a93
line wrap: on
line diff
--- a/src/share/vm/memory/genCollectedHeap.hpp	Thu Apr 12 12:07:09 2012 -0700
+++ b/src/share/vm/memory/genCollectedHeap.hpp	Tue May 08 07:29:27 2012 -0700
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 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
@@ -357,7 +357,7 @@
   void prepare_for_verify();
 
   // Override.
-  void verify(bool allow_dirty, bool silent, VerifyOption option);
+  void verify(bool silent, VerifyOption option);
 
   // Override.
   virtual void print_on(outputStream* st) const;