From b987342bab23bb8c12b15cfbbda73aa6ff09f238 Mon Sep 17 00:00:00 2001 From: "Joel E. Denny" Date: Wed, 20 May 2009 17:14:08 -0400 Subject: [PATCH] * data/c++.m4 (b4_namespace_close): Simplify slightly. (cherry picked from commit e7bfa8b7211e2a02f4cec6f122b3141ad2ca97fb) --- ChangeLog | 4 ++++ data/c++.m4 | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 31217ab0..029beebb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2009-05-20 Joel E. Denny + + * data/c++.m4 (b4_namespace_close): Simplify slightly. + 2009-05-19 Joel E. Denny Handle a trailing `:' in a user-supplied C++ namespace better. diff --git a/data/c++.m4 b/data/c++.m4 index 22ba5314..7590f08a 100644 --- a/data/c++.m4 +++ b/data/c++.m4 @@ -75,9 +75,9 @@ m4_define([b4_namespace_open], m4_define([b4_namespace_close], [b4_user_code([b4_percent_define_get_syncline([[namespace]]) m4_bpatsubst(m4_dquote(m4_bpatsubst(m4_dquote(b4_namespace_ref[ ]), - [^\(.\)[ ]*\(::\)?\([^][:]\|:[^][:]\)*], + [^\(.\)[ ]*\(::\)?\([^][:]\|:[^:]\)*], [\1])), - [::\([^][:]\|:[^][:]\)*], [} ])[} // ]b4_namespace_ref])]) + [::\([^][:]\|:[^:]\)*], [} ])[} // ]b4_namespace_ref])]) # b4_token_enums(LIST-OF-PAIRS-TOKEN-NAME-TOKEN-NUMBER) -- 2.45.2