diff options
| author | harriss <harriss@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-05-30 23:16:19 +0000 |
|---|---|---|
| committer | harriss <harriss@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-05-30 23:16:19 +0000 |
| commit | ee3bdb7468509a7956fed700dab75a6f57974540 (patch) | |
| tree | 6cc2ac4a24908f911e0b5dfac9616881ccfb136b | |
| parent | e987d3f40b421664e662e83c6c91930fa3e9c553 (diff) | |
| download | ATCD-ee3bdb7468509a7956fed700dab75a6f57974540.tar.gz | |
ChangeLogTag: Wed May 30 23:10:45 UTC 2007 Scott Harris <harris_s@ociweb.com>
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/TAO_IDL/fe/idl.ll | 22 |
2 files changed, 22 insertions, 7 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 1f5ace5c536..aa42e9a7fb3 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Wed May 30 23:10:45 UTC 2007 Scott Harris <harris_s@ociweb.com> + + * TAO_IDL/fe/idl.ll: + + This should have been part of the Fri May 25 18:02:30 UTC 2007 + commit. + Wed May 30 20:18:11 UTC 2007 Yan Dai <dai_y@ociweb.com> These changes support built in sequences in DDS. diff --git a/TAO/TAO_IDL/fe/idl.ll b/TAO/TAO_IDL/fe/idl.ll index 34b2c5eafc2..efe27a2bf30 100644 --- a/TAO/TAO_IDL/fe/idl.ll +++ b/TAO/TAO_IDL/fe/idl.ll @@ -732,30 +732,38 @@ idl_store_pragma (char *buf) } else if (ACE_OS::strncmp (buf + 8, "DCPS_DATA_TYPE", 14) == 0) { - char *foo_type = idl_get_pragma_string (buf); - idl_global->add_dcps_data_type(foo_type); + char *sample_type = idl_get_pragma_string (buf); + idl_global->add_dcps_data_type (sample_type); } else if (ACE_OS::strncmp (buf + 8, "DCPS_DATA_KEY", 13) == 0) { char *tmp = idl_get_pragma_string (buf); // split up data type and key strings - char *foo_type = tmp; - while (*tmp && !isspace(*tmp)) + char *sample_type = tmp; + while (*tmp && !isspace (*tmp)) tmp++; - while (isspace(*tmp)) + while (isspace (*tmp)) { *tmp = '\0'; tmp++; } char *key = tmp; - if (!idl_global->add_dcps_data_key(foo_type, key)) + if (!idl_global->add_dcps_data_key (sample_type, key)) { ACE_ERROR((LM_ERROR, "DCPS_DATA_TYPE \"%s\" not found for key \"%s\"\n", - foo_type, key)); + sample_type, key)); } } + else if (ACE_OS::strncmp (buf + 8, "DCPS_SUPPORT_ZERO_COPY_READ", 27) == 0) + { + idl_global->dcps_support_zero_copy_read (true); + } + else if (ACE_OS::strncmp (buf + 8, "DCPS_GEN_ZERO_COPY_READ", 23) == 0) + { + idl_global->dcps_gen_zero_copy_read (true); + } } /* |