diff options
author | Oliver Kellogg <okellogg@users.sourceforge.net> | 2018-02-04 19:43:06 +0100 |
---|---|---|
committer | Oliver Kellogg <okellogg@users.sourceforge.net> | 2018-02-04 19:43:06 +0100 |
commit | e1f507ba668b0373e2ef3ab6fb74a9f792374fb3 (patch) | |
tree | 3eecfb56ddbba960cbf9d43393740ba1385f5bb8 | |
parent | 2030786490a776fc7fd3a538e3b46ba63cfa6c11 (diff) | |
download | ATCD-e1f507ba668b0373e2ef3ab6fb74a9f792374fb3.tar.gz |
Followup to commit 3f751cb addresses
https://github.com/DOCGroup/ACE_TAO/pull/567#issuecomment-360504123 ,
> [...] the Solaris/SunCC build failed because its preprocessor splits
> the @ from the following token:
>
> $ echo '@foo' > /tmp/foo.c && /opt/compilers/suncc5.12/bin/CC -E \
> /tmp/foo.c && rm /tmp/foo.c
> #1 "/tmp/foo.c"
> @ foo
TAO/TAO_IDL/fe/idl.ll
- Modify the rule matching annotations to include an optional space
after the '@',
@ ?[A-Za-z][A-Za-z0-9_]*[ \t]*(\([^)]+\))?
-rw-r--r-- | TAO/TAO_IDL/fe/idl.ll | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/TAO/TAO_IDL/fe/idl.ll b/TAO/TAO_IDL/fe/idl.ll index 34b42a350cb..7e1fc9cac6e 100644 --- a/TAO/TAO_IDL/fe/idl.ll +++ b/TAO/TAO_IDL/fe/idl.ll @@ -403,8 +403,9 @@ L"'"\\u([0-9a-fA-F]{1,4})"'" { } break; } -@[A-Za-z][A-Za-z0-9_]*[ \t]*(\([^)]+\))? - break; +@ ?[A-Za-z][A-Za-z0-9_]*[ \t]*(\([^)]+\))? { + break; + } [ \t]* break; {NL} { idl_global->set_lineno (idl_global->lineno () + 1); |