I can self-approve this one, assuming that patch 1 is approved. libcpp/ChangeLog: * lex.cc: Replace uses of "FINAL" and "OVERRIDE" with "final" and "override".
Signed-off-by: David Malcolm <dmalc...@redhat.com> --- libcpp/lex.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libcpp/lex.cc b/libcpp/lex.cc index fb1dfabb7af..f891d3e17df 100644 --- a/libcpp/lex.cc +++ b/libcpp/lex.cc @@ -1523,7 +1523,7 @@ class unpaired_bidi_rich_location : public rich_location class custom_range_label : public range_label { public: - label_text get_text (unsigned range_idx) const FINAL OVERRIDE + label_text get_text (unsigned range_idx) const final override { /* range 0 is the primary location; each subsequent range i + 1 is for bidi::vec[i]. */ -- 2.26.3