# HG changeset patch
# User mgerdin
# Date 1417702158 -3600
# Node ID 0114350a1cb05f33a327119a55429bf7190bbb89
# Parent  12c6386f677596096bf4bc650183af516bef4acb# Parent  35c65cbbe92b9954681dd8298e08380e0bd2fee3
Merge

diff -r 12c6386f6775 -r 0114350a1cb0 hotspot/src/share/vm/gc_implementation/parNew/parOopClosures.inline.hpp
--- a/hotspot/src/share/vm/gc_implementation/parNew/parOopClosures.inline.hpp	Thu Dec 04 10:40:19 2014 +0100
+++ b/hotspot/src/share/vm/gc_implementation/parNew/parOopClosures.inline.hpp	Thu Dec 04 15:09:18 2014 +0100
@@ -28,6 +28,7 @@
 #include "gc_implementation/parNew/parNewGeneration.hpp"
 #include "gc_implementation/parNew/parOopClosures.hpp"
 #include "memory/cardTableRS.hpp"
+#include "memory/genCollectedHeap.hpp"
 
 template <class T> inline void ParScanWeakRefClosure::do_oop_work(T* p) {
   assert (!oopDesc::is_null(*p), "null weak reference?");