diff options
| author | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-03-17 07:32:37 +0000 |
|---|---|---|
| committer | irfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1999-03-17 07:32:37 +0000 |
| commit | 74a590c8cf48e419e2cec4051aed2d09a0db254b (patch) | |
| tree | f82a91afc7d8b126d1daeb2150fb490026a2718e | |
| parent | f94d07d3c01fa5ff37c47cfe9b769901bee05efc (diff) | |
| download | ATCD-74a590c8cf48e419e2cec4051aed2d09a0db254b.tar.gz | |
*** empty log message ***
| -rw-r--r-- | TAO/ChangeLog-99c | 15 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp | 2 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp | 4 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp | 3 | ||||
| -rw-r--r-- | TAO/tao/Object.cpp | 6 |
5 files changed, 25 insertions, 5 deletions
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c index 09a1ab32cb1..cb4789bec6e 100644 --- a/TAO/ChangeLog-99c +++ b/TAO/ChangeLog-99c @@ -1,3 +1,18 @@ +Tue Mar 17 01:01:57 1999 Irfan Pyarali <irfan@cs.wustl.edu> + + * tao/Object.cpp (_non_existent): + * TAO_IDL/be/be_visitor_operation/operation_cs.cpp + (gen_marshal_and_invoke): <_invoke_status> should be set before + use (at least according to g++). + + * orbsvcs/orbsvcs/Time/TAO_UTO.cpp (TAO_UTO): Changed + <this->attr_utc_time_.inacchi> to 0 since the conversion + routines Vishal used are not supported on vxworks. Vishal should + consult David in fixing this correctly. + + * orbsvcs/orbsvcs/Time/Timer_Helper.cpp (handle_timeout): Also + changed <lowest_time> to 0. Vishal should fix this also. + Tue Mar 16 15:52:57 1999 David L. Levine <levine@cs.wustl.edu> * tao/POAManager.i (lock): moved function definition before inline diff --git a/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp b/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp index 4d7e6cf8518..4aea6b483fb 100644 --- a/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_operation/operation_cs.cpp @@ -753,7 +753,7 @@ be_compiled_visitor_operation_cs::gen_marshal_and_invoke (be_operation } *os << be_nl - << "TAO_GIOP_ReplyStatusType _invoke_status;" << be_nl + << "TAO_GIOP_ReplyStatusType _invoke_status = TAO_GIOP_NO_EXCEPTION;" << be_nl << "ACE_TRY_EX (_tao_INVOKE_FAILED)" << be_idt_nl << "{" << be_idt_nl; diff --git a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp index ff9800e8f76..a5eb2c4eddc 100644 --- a/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/TAO_UTO.cpp @@ -18,7 +18,11 @@ TAO_UTO::TAO_UTO (TimeBase::TimeT time, // Extract the lower 16 bits of the remaining bits. 'And'ing with 0xFFFF // is only a sanity check. +#if defined (VXWORKS) + this->attr_utc_time_.inacchi = 0; +#else this->attr_utc_time_.inacchi = (CORBA::UShort) (inaccuracy >> 32) & (0xFFFF); +#endif /* VXWORKS */ this->attr_utc_time_.tdf = tdf; diff --git a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp index 3ff72a8dcb8..3513e9e8423 100644 --- a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp +++ b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp @@ -34,7 +34,8 @@ Timer_Helper::handle_timeout (const ACE_Time_Value &, // in synchronization. #if defined (ACE_LACKS_LONGLONG_T) - CORBA::ULongLong lowest_time (ACE_UINT64_LITERAL(0xFFFFFFFFFFFFFFFF)); + // CORBA::ULongLong lowest_time (ACE_UINT64_LITERAL(0xFFFFFFFFFFFFFFFF)); + CORBA::ULongLong lowest_time (0); #else CORBA::ULongLong lowest_time = ACE_UINT64_LITERAL(0xFFFFFFFFFFFFFFFF); #endif diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp index 3daeb5e06c6..92b69b2e0d4 100644 --- a/TAO/tao/Object.cpp +++ b/TAO/tao/Object.cpp @@ -89,7 +89,7 @@ _tao_start_again: ACE_ENDTRY; ACE_CHECK_RETURN (_tao_retval); - TAO_GIOP_ReplyStatusType _invoke_status; + TAO_GIOP_ReplyStatusType _invoke_status = TAO_GIOP_NO_EXCEPTION; ACE_TRY_EX (_tao_INVOKE_FAILED) { _invoke_status = @@ -216,7 +216,7 @@ _tao_start_again: )) ACE_THROW_RETURN (CORBA::MARSHAL (CORBA::COMPLETED_NO), _tao_retval); - TAO_GIOP_ReplyStatusType _invoke_status; + TAO_GIOP_ReplyStatusType _invoke_status = TAO_GIOP_NO_EXCEPTION; ACE_TRY_EX (_tao_INVOKE_FAILED) { _invoke_status = @@ -328,7 +328,7 @@ _tao_start_again: ACE_ENDTRY; ACE_CHECK_RETURN (_tao_retval); - TAO_GIOP_ReplyStatusType _invoke_status; + TAO_GIOP_ReplyStatusType _invoke_status = TAO_GIOP_NO_EXCEPTION; ACE_TRY_EX (_tao_INVOKE_FAILED) { _invoke_status = |