diff options
| author | Marijke Hengstmengel <MHengstmengel@users.noreply.github.com> | 2011-11-07 13:08:48 +0000 |
|---|---|---|
| committer | Marijke Hengstmengel <MHengstmengel@users.noreply.github.com> | 2011-11-07 13:08:48 +0000 |
| commit | b97045cd6c0d3518792c769df92ef936258481bb (patch) | |
| tree | dac7186974db4b3ad9fd17141531da4ab23f4807 | |
| parent | f3a063b97bb83bf475e441a10762ca0aeca51a4a (diff) | |
| download | ATCD-b97045cd6c0d3518792c769df92ef936258481bb.tar.gz | |
Mon Nov 7 13:02:55 UTC 2011 Marijke Hengstmengel <hengstmengel_m@remedy.nl>
* TAO_IDL/fe/idl.ll:
* TAO_IDL/fe/lex.yy.cpp:
Add beside pragma's 'ciao ami4ccm ...' the pragma's 'ami4ccm ...' , according to ami4ccm spec.
In the future '#pragma ciao ami4ccm ...' has to be removed.
| -rw-r--r-- | TAO/ChangeLog.BRANCH | 13 | ||||
| -rw-r--r-- | TAO/TAO_IDL/fe/idl.ll | 9 | ||||
| -rw-r--r-- | TAO/TAO_IDL/fe/lex.yy.cpp | 9 |
3 files changed, 25 insertions, 6 deletions
diff --git a/TAO/ChangeLog.BRANCH b/TAO/ChangeLog.BRANCH new file mode 100644 index 00000000000..faf25b6c631 --- /dev/null +++ b/TAO/ChangeLog.BRANCH @@ -0,0 +1,13 @@ +Mon Nov 7 13:02:55 UTC 2011 Marijke Hengstmengel <hengstmengel_m@remedy.nl> + + * TAO_IDL/fe/idl.ll: + * TAO_IDL/fe/lex.yy.cpp: + Add beside pragma's 'ciao ami4ccm ...' the pragma's 'ami4ccm ...' , according to ami4ccm spec. + In the future '#pragma ciao ami4ccm ...' has to be removed. + + +Local Variables: +mode: change-log +add-log-time-format: (lambda () (progn (setq tz (getenv "TZ")) (set-time-zone-rule "UTC") (setq time (format-time-string "%a %b %e %H:%M:%S %Z %Y" (current-time))) (set-time-zone-rule tz) time)) +indent-tabs-mode: nil +End: diff --git a/TAO/TAO_IDL/fe/idl.ll b/TAO/TAO_IDL/fe/idl.ll index dfe41a3e039..ff88c20ada1 100644 --- a/TAO/TAO_IDL/fe/idl.ll +++ b/TAO/TAO_IDL/fe/idl.ll @@ -846,7 +846,8 @@ idl_store_pragma (char *buf) // Delete tmp since add_ciao_spl_ts_file_names() doesn't take its ownership. delete [] tmp; } - else if (ACE_OS::strncmp (buf + 8, "ciao ami4ccm interface", 22) == 0) + else if ((ACE_OS::strncmp (buf + 8, "ciao ami4ccm interface", 22) == 0) || + (ACE_OS::strncmp (buf + 8, "ami4ccm interface", 17) == 0)) { if (idl_global->in_main_file ()) { @@ -857,7 +858,8 @@ idl_store_pragma (char *buf) delete [] tmp; } } - else if (ACE_OS::strncmp (buf + 8, "ciao ami4ccm receptacle", 23) == 0) + else if ((ACE_OS::strncmp (buf + 8, "ciao ami4ccm receptacle", 23) == 0)|| + (ACE_OS::strncmp (buf + 8, "ami4ccm receptacle", 18) == 0)) { char *tmp = idl_get_pragma_string (buf); @@ -876,7 +878,8 @@ idl_store_pragma (char *buf) // Delete tmp since add_ciao_spl_ts_file_names() doesn't take its ownership. delete [] tmp; } - else if (ACE_OS::strncmp (buf + 8, "ciao ami4ccm idl", 16) == 0) + else if ((ACE_OS::strncmp (buf + 8, "ciao ami4ccm idl", 16) == 0) || + (ACE_OS::strncmp (buf + 8, "ami4ccm idl", 11) == 0)) { char *tmp = idl_get_pragma_string (buf); diff --git a/TAO/TAO_IDL/fe/lex.yy.cpp b/TAO/TAO_IDL/fe/lex.yy.cpp index 1ba2ff65fac..e0242d36959 100644 --- a/TAO/TAO_IDL/fe/lex.yy.cpp +++ b/TAO/TAO_IDL/fe/lex.yy.cpp @@ -3368,7 +3368,8 @@ idl_store_pragma (char *buf) // Delete tmp since add_ciao_spl_ts_file_names() doesn't take its ownership. delete [] tmp; } - else if (ACE_OS::strncmp (buf + 8, "ciao ami4ccm interface", 22) == 0) + else if ((ACE_OS::strncmp (buf + 8, "ciao ami4ccm interface", 22) == 0) || + (ACE_OS::strncmp (buf + 8, "ami4ccm interface", 17) == 0)) { if (idl_global->in_main_file ()) { @@ -3379,7 +3380,8 @@ idl_store_pragma (char *buf) delete [] tmp; } } - else if (ACE_OS::strncmp (buf + 8, "ciao ami4ccm receptacle", 23) == 0) + else if ((ACE_OS::strncmp (buf + 8, "ciao ami4ccm receptacle", 23) == 0) || + (ACE_OS::strncmp (buf + 8, "ami4ccm receptacle", 18) == 0)) { char *tmp = idl_get_pragma_string (buf); @@ -3398,7 +3400,8 @@ idl_store_pragma (char *buf) // Delete tmp since add_ciao_spl_ts_file_names() doesn't take its ownership. delete [] tmp; } - else if (ACE_OS::strncmp (buf + 8, "ciao ami4ccm idl", 16) == 0) + else if ((ACE_OS::strncmp (buf + 8, "ciao ami4ccm idl", 16) == 0) || + (ACE_OS::strncmp (buf + 8, "ami4ccm idl", 11) == 0)) { char *tmp = idl_get_pragma_string (buf); |