Merge branch 'bug-string-wrapping-rel' into release

Change-Id: I31fa3c7c267cce709a0ad44ca6ba09af2592caa7

Merge branch 'bug-string-wrapping-rel' into release
Change-Id: I31fa3c7c267cce709a0ad44ca6ba09af2592caa7
75745365 · Dave DeMarle · bc2c8f4e · e46fcca5 · 75745365 · 75745365
Commit 75745365 authored Mar 20, 2012 by Dave DeMarle
--- a/Wrapping/lex.yy.c
+++ b/Wrapping/lex.yy.c
--- a/Wrapping/vtkParse.l
+++ b/Wrapping/vtkParse.l
@@ -406,7 +406,7 @@ static int pop_buffer();
                     yylval.str = vtkstrndup(yytext, yyleng);
                     return(ISTREAM); }

-("vtkStdString"|("vtkstd::"|"std::")?"string"\[^a-zA-Z_]) {
+("vtkStdString"|("vtkstd::"|"std::")?"string")/[^a-zA-Z0-9_] {
                     yylval.str = vtkstrndup(yytext, yyleng);
                     return(StdString); }