From d6b55458a49e56f5446f4b21027b2409271f28b2 Mon Sep 17 00:00:00 2001 From: Robert Young Date: Wed, 4 Oct 2017 12:48:39 -0400 Subject: [PATCH] Root the J9DRRStructTableGC friend decl We need to ensure we are always friending the correct class. The J9DDRStructTableGC class is defined in the root namespace. When we start to use the OMR::GC namespace, the friend declaration no longer references the correct DDR class. Signed-off-by: Robert Young --- runtime/gc_ddr/gc_xlat.sed | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/runtime/gc_ddr/gc_xlat.sed b/runtime/gc_ddr/gc_xlat.sed index 2a71284527e..f0ae01d3110 100644 --- a/runtime/gc_ddr/gc_xlat.sed +++ b/runtime/gc_ddr/gc_xlat.sed @@ -24,10 +24,12 @@ s/[^[:print:][:blank:]]$// 1i\ /* Preprocessed to add J9DDRStructTableGC as a friend. Do not edit this version! */ +1i\ +class J9DDRStructTableGC; s/class .*{$/&\ - friend class J9DDRStructTableGC;/ + friend class ::J9DDRStructTableGC;/ /class .*[^;{]$/{ N s/^\(.*\n{.*\)$/\1\ - friend class J9DDRStructTableGC;/ + friend class ::J9DDRStructTableGC;/ }