diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-03-24 02:52:28 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-03-24 02:52:28 +0000 |
| commit | f33e00948776e1f2f8405597e982aa4c8165f0b4 (patch) | |
| tree | f38ff5e2e0a7489d56b0f1da2593a60052a0e40f | |
| parent | e051af16474b6f8e742e1db62d5d401b8e25ce47 (diff) | |
| download | ATCD-f33e00948776e1f2f8405597e982aa4c8165f0b4.tar.gz | |
ChangeLogTag: Thu Mar 23 20:49:43 2000 David L. Levine <levine@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 31 | ||||
| -rw-r--r-- | TAO/tao/append.cpp | 12 | ||||
| -rw-r--r-- | TAO/tao/skip.cpp | 12 |
3 files changed, 34 insertions, 21 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 12959850df6..73bca80965a 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,28 +1,37 @@ +Thu Mar 23 20:49:43 2000 David L. Levine <levine@cs.wustl.edu> + + * tao/append.cpp (append), skip.cpp (skip): replaced + assignment of ~0UL to a CORBA::ULong, because cxx + complained about the 64-to-32 bit truncation. Instead, + created a local const null_member that should be platform + independent (at the expense of a static_cast, to be really + sure that no compiler complains). + Thu Mar 23 15:26:52 2000 Carlos O'Ryan <coryan@uci.edu> - * PROBLEM-REPORT-FORM: - Modified the text to encourage users to report real bugs to - Bugzilla, that way we don't have to enter them ourselves. Only - dubious stuff should be reported to the mailing list. + * PROBLEM-REPORT-FORM: + Modified the text to encourage users to report real bugs to + Bugzilla, that way we don't have to enter them ourselves. Only + dubious stuff should be reported to the mailing list. Thu Mar 23 17:02:46 2000 Balachandran Natarajan <bala@cs.wustl.edu> - * tests/AMI/Makefile: - * examples/Buffered_AMI/Makefile: Updated dependencies. Thanks to - Jeff for reporting this. + * tests/AMI/Makefile: + * examples/Buffered_AMI/Makefile: Updated dependencies. Thanks to + Jeff for reporting this. Thu Mar 23 15:38:23 2000 Balachandran Natarajan <bala@cs.wustl.edu> - * tao/GIOP_Message_Accept_State.cpp: Fixed a typo. + * tao/GIOP_Message_Accept_State.cpp: Fixed a typo. Thu Mar 23 14:48:12 2000 Nanbor Wang <nanbor@cs.wustl.edu> * TAO_IDL/be/be_codegen.cpp: * tao/*.h: * orbsvcs/orbsvcs/*.h: Moved the inclusion of <pre.h> down after - the definition of header guard macro. The original order - violated the ACE programming guideline. Thanks to Carlos for - catching this. + the definition of header guard macro. The original order + violated the ACE programming guideline. Thanks to Carlos for + catching this. Thu Mar 23 11:06:24 2000 Carlos O'Ryan <coryan@uci.edu> diff --git a/TAO/tao/append.cpp b/TAO/tao/append.cpp index fb30811a89c..a3a05e6159d 100644 --- a/TAO/tao/append.cpp +++ b/TAO/tao/append.cpp @@ -447,10 +447,12 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc, tc->member_count (ACE_TRY_ENV); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); - CORBA::ULong current_member = ~0UL; - CORBA::ULong default_member = ~0UL; + const CORBA::ULong null_member = ~ACE_static_cast (CORBA::ULong, 0U); + + CORBA::ULong current_member = null_member; + CORBA::ULong default_member = null_member; for (CORBA::ULong i = 0; - i != member_count && current_member == ~0UL; + i != member_count && current_member == null_member; ++i) { CORBA::Any *any = @@ -545,11 +547,11 @@ TAO_Marshal_Union::append (CORBA::TypeCode_ptr tc, } } - if (current_member == ~0UL) + if (current_member == null_member) { // Cannot find the current member, check if there is a // default... - if (default_member != ~0UL) + if (default_member != null_member) { // Good, use the default to append... CORBA::TypeCode_ptr member_tc = diff --git a/TAO/tao/skip.cpp b/TAO/tao/skip.cpp index 110c717b218..8787173db26 100644 --- a/TAO/tao/skip.cpp +++ b/TAO/tao/skip.cpp @@ -433,10 +433,12 @@ TAO_Marshal_Union::skip (CORBA::TypeCode_ptr tc, tc->member_count (ACE_TRY_ENV); ACE_CHECK_RETURN (CORBA::TypeCode::TRAVERSE_STOP); - CORBA::ULong current_member = ~0UL; - CORBA::ULong default_member = ~0UL; + const CORBA::ULong null_member = ~ACE_static_cast (CORBA::ULong, 0U); + + CORBA::ULong current_member = null_member; + CORBA::ULong default_member = null_member; for (CORBA::ULong i = 0; - i != member_count && current_member == ~0UL; + i != member_count && current_member == null_member; ++i) { CORBA::Any *any = @@ -531,11 +533,11 @@ TAO_Marshal_Union::skip (CORBA::TypeCode_ptr tc, } } - if (current_member == ~0UL) + if (current_member == null_member) { // Cannot find the current member, check if there is a // default... - if (default_member != ~0UL) + if (default_member != null_member) { // Good, use the default to append... CORBA::TypeCode_ptr member_tc = |