From a166e260c128434fabe0cf9b0d8765735e2e4517 Mon Sep 17 00:00:00 2001 From: Andreas Scherer Date: Mon, 18 Jul 2022 15:41:37 +0000 Subject: Fix 'dispatch_recurse_func' for older g++. git-svn-id: svn://tug.org/texlive/trunk@63926 c570f23f-e606-0410-a88d-b1316a301751 --- .../libs/harfbuzz/harfbuzz-src/src/hb-ot-layout-gpos-table.hh | 6 +++++- .../libs/harfbuzz/harfbuzz-src/src/hb-ot-layout-gsub-table.hh | 7 +++++-- 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'Build/source') diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout-gpos-table.hh b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout-gpos-table.hh index 064d31cdff5..59795cbba3e 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout-gpos-table.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout-gpos-table.hh @@ -35,6 +35,9 @@ namespace OT { using Layout::GPOS_impl::PosLookup; +namespace Layout { +namespace GPOS_impl { + // TODO(garretrieger): Move into new layout directory. /* Out-of-class implementation for methods recursing */ #ifndef HB_NO_OT_LAYOUT @@ -68,7 +71,8 @@ inline bool PosLookup::dispatch_recurse_func (hb_ot_apply } #endif +} /* namespace GPOS_impl */ +} /* namespace Layout */ } /* namespace OT */ - #endif /* HB_OT_LAYOUT_GPOS_TABLE_HH */ diff --git a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout-gsub-table.hh b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout-gsub-table.hh index 462542025b5..9e7f40c07bf 100644 --- a/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout-gsub-table.hh +++ b/Build/source/libs/harfbuzz/harfbuzz-src/src/hb-ot-layout-gsub-table.hh @@ -36,6 +36,9 @@ namespace OT { using Layout::GSUB::SubstLookup; using Layout::GSUB::ExtensionSubst; +namespace Layout { +namespace GSUB { + // TODO(garretrieger): Move into the new layout directory. /* Out-of-class implementation for methods recursing */ @@ -82,8 +85,8 @@ inline bool SubstLookup::dispatch_recurse_func (hb_ot_app } #endif - +} /* namespace GSUB */ +} /* namespace Layout */ } /* namespace OT */ - #endif /* HB_OT_LAYOUT_GSUB_TABLE_HH */ -- cgit v1.2.3