diff options
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 17 | ||||
| -rw-r--r-- | TAO/TAO_IDL/be/be_visitor_exception/cdr_op_ci.cpp | 2 | ||||
| -rw-r--r-- | TAO/tao/Exception.cpp | 6 | ||||
| -rw-r--r-- | TAO/tao/Exception.h | 3 | ||||
| -rw-r--r-- | TAO/tao/POAC.i | 4 |
5 files changed, 22 insertions, 10 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 5f683f26512..de2c525485a 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,20 @@ +Thu Mar 2 09:09:58 2000 Carlos O'Ryan <coryan@uci.edu> + + * tao/Exception.h: + * tao/Exception.cpp: + The CORBA::UserException is abstract, the _raise() method cannot + be defined for it. + + * tao/POAC.i: + The ForwardRequest exception is not present with minimum CORBA, + yet i did not protect the CDR insertion and extraction operators + for it with TAO_HAS_MINIMUM_CORBA == 0 + + * TAO_IDL/be/be_visitor_exception/cdr_op_ci.cpp: + For exceptions without any fields the operator>> declared on the + header file and the one defined in the .i file were not + matching. + Wed Mar 1 21:36:38 2000 Darrell Brunsch <brunsch@uci.edu> * tao/POAC.h: diff --git a/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_ci.cpp b/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_ci.cpp index a82b49e9616..2df15c83c41 100644 --- a/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_ci.cpp +++ b/TAO/TAO_IDL/be/be_visitor_exception/cdr_op_ci.cpp @@ -126,7 +126,7 @@ be_visitor_exception_cdr_op_ci::visit_exception (be_exception *node) else { *os << "," - << node->name () << ")" << be_nl; + << node->name () << "&)" << be_nl; } *os << "{" << be_idt_nl; diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp index aee0a4d7a7c..5525bad34a6 100644 --- a/TAO/tao/Exception.cpp +++ b/TAO/tao/Exception.cpp @@ -197,12 +197,6 @@ CORBA_UserException::operator= (const CORBA_UserException &src) return *this; } -void -CORBA_UserException::_raise (void) -{ - TAO_RAISE (*this); -} - int CORBA_UserException::_is_a (const char* interface_id) const { diff --git a/TAO/tao/Exception.h b/TAO/tao/Exception.h index 0d5977eea7e..ae579ed705f 100644 --- a/TAO/tao/Exception.h +++ b/TAO/tao/Exception.h @@ -138,9 +138,6 @@ public: CORBA_UserException &operator= (const CORBA_UserException &src); // Assignment operator. - virtual void _raise (void); - // To throw an exception of this type. - static CORBA_UserException *_narrow (CORBA_Exception *exception); // The narrow operation. diff --git a/TAO/tao/POAC.i b/TAO/tao/POAC.i index 9759d5f46d4..a65b62eaf54 100644 --- a/TAO/tao/POAC.i +++ b/TAO/tao/POAC.i @@ -3091,6 +3091,8 @@ PortableServer::Current_out::operator-> (void) // **************************************************************** +#if (TAO_HAS_MINIMUM_POA == 0) + ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::ForwardRequest &_tao_aggregate) { // first marshal the repository ID @@ -3119,6 +3121,8 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm,PortableServer::Forward return 0; } +#endif /* TAO_HAS_MINIMUM_POA == 0 */ + ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const PortableServer::POAManager::AdapterInactive &_tao_aggregate) { // first marshal the repository ID |