*** old/src/share/vm/gc_implementation/parallelScavenge/psScavenge.hpp	Fri Feb 10 17:21:31 2012
--- new/src/share/vm/gc_implementation/parallelScavenge/psScavenge.hpp	Fri Feb 10 17:21:30 2012

*** 1,7 ****
--- 1,7 ----
  /*
!  * Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
!  * Copyright (c) 2002, 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
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.

*** 133,143 ****
--- 133,144 ----
    // argument is a convenience wrapper that fetches the to_space pointer from
    // the heap and calls the other version (if the arg is true).
    template <class T> static inline bool should_scavenge(T* p, MutableSpace* to_space);
    template <class T> static inline bool should_scavenge(T* p, bool check_to_space);
  
!   template <class T> inline static void copy_and_push_safe_barrier(PSPromotionManager* pm, T* p);
!   template <class T, bool promote_immediately>
+     inline static void copy_and_push_safe_barrier(PSPromotionManager* pm, T* p);
  
    // Is an object in the young generation
    // This assumes that the HeapWord argument is in the heap,
    // so it only checks one side of the complete predicate.
    inline static bool is_obj_in_young(HeapWord* o) {