* data/c++.m4 (b4_namespace_close): Simplify slightly.

(cherry picked from commit e7bfa8b7211e2a02f4cec6f122b3141ad2ca97fb)

diff --git a/ChangeLog b/ChangeLog
index 31217ab047a589bfbf7406a21c19f61e70a29a92..029beebb495304a8769bd20071c222664edb4333 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 22ba5314fd9e683ba6462b5db9257e0c02394635..7590f08a83a54223cab707f975548b7716f37996 100644 (file)
--- 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)