--- old/src/share/vm/gc_implementation/shared/isGCActiveMark.hpp	2015-05-13 13:58:40.628675469 +0200
+++ /dev/null	2015-03-18 17:10:38.111854831 +0100
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2002, 2013, 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.
- *
- * This code is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
- * version 2 for more details (a copy is included in the LICENSE file that
- * accompanied this code).
- *
- * You should have received a copy of the GNU General Public License version
- * 2 along with this work; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
- *
- * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
- * or visit www.oracle.com if you need additional information or have any
- * questions.
- *
- */
-
-#ifndef SHARE_VM_GC_IMPLEMENTATION_SHARED_ISGCACTIVEMARK_HPP
-#define SHARE_VM_GC_IMPLEMENTATION_SHARED_ISGCACTIVEMARK_HPP
-
-#include "utilities/macros.hpp"
-#if INCLUDE_ALL_GCS
-#include "gc_implementation/parallelScavenge/parallelScavengeHeap.hpp"
-#endif // INCLUDE_ALL_GCS
-
-// This class provides a method for block structured setting of the
-// _is_gc_active state without requiring accessors in CollectedHeap
-
-class IsGCActiveMark : public StackObj {
- public:
-  IsGCActiveMark() {
-    CollectedHeap* heap = Universe::heap();
-    assert(!heap->is_gc_active(), "Not reentrant");
-    heap->_is_gc_active = true;
-  }
-
-  ~IsGCActiveMark() {
-    CollectedHeap* heap = Universe::heap();
-    assert(heap->is_gc_active(), "Sanity");
-    heap->_is_gc_active = false;
-  }
-};
-
-#endif // SHARE_VM_GC_IMPLEMENTATION_SHARED_ISGCACTIVEMARK_HPP
--- /dev/null	2015-03-18 17:10:38.111854831 +0100
+++ new/src/share/vm/gc/shared/isGCActiveMark.hpp	2015-05-13 13:58:40.449668032 +0200
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2002, 2015, 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.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ *
+ */
+
+#ifndef SHARE_VM_GC_SHARED_ISGCACTIVEMARK_HPP
+#define SHARE_VM_GC_SHARED_ISGCACTIVEMARK_HPP
+
+#include "utilities/macros.hpp"
+#if INCLUDE_ALL_GCS
+#include "gc/parallel/parallelScavengeHeap.hpp"
+#endif // INCLUDE_ALL_GCS
+
+// This class provides a method for block structured setting of the
+// _is_gc_active state without requiring accessors in CollectedHeap
+
+class IsGCActiveMark : public StackObj {
+ public:
+  IsGCActiveMark() {
+    CollectedHeap* heap = Universe::heap();
+    assert(!heap->is_gc_active(), "Not reentrant");
+    heap->_is_gc_active = true;
+  }
+
+  ~IsGCActiveMark() {
+    CollectedHeap* heap = Universe::heap();
+    assert(heap->is_gc_active(), "Sanity");
+    heap->_is_gc_active = false;
+  }
+};
+
+#endif // SHARE_VM_GC_SHARED_ISGCACTIVEMARK_HPP