diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | data/c++.m4 | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -1,3 +1,7 @@ +2009-05-20 Joel E. Denny <jdenny@ces.clemson.edu> + + * data/c++.m4 (b4_namespace_close): Simplify slightly. + 2009-05-19 Joel E. Denny <jdenny@ces.clemson.edu> 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) |