From e803afe9743c9d75aa631beb31626ed2943544cc Mon Sep 17 00:00:00 2001 From: coryan Date: Sun, 6 Jun 1999 04:09:22 +0000 Subject: ChangeLogTag:Sat Jun 5 23:06:01 1999 Carlos O'Ryan --- TAO/ChangeLog-99c | 44 ++++++++++++++++ TAO/tao/CDR_Interpreter.cpp | 1 - TAO/tao/DynAnyC.h | 1 - TAO/tao/DynUnion_i.cpp | 2 + TAO/tao/GIOP.h | 1 - TAO/tao/Messaging_Policy_i.h | 5 +- TAO/tao/Messaging_Policy_i.i | 8 +++ TAO/tao/ObjectIDList.h | 1 - TAO/tao/Object_Adapter.h | 2 + TAO/tao/Object_Adapter.i | 6 +++ TAO/tao/Operation_Table.h | 2 +- TAO/tao/PolicyC.h | 1 - TAO/tao/Policy_Manager.h | 3 ++ TAO/tao/Policy_Manager.i | 5 ++ TAO/tao/Request.h | 1 - TAO/tao/Sequence.h | 5 +- TAO/tao/Services.h | 119 +++++++++++++++++++++---------------------- TAO/tao/Stub.cpp | 1 - TAO/tao/corba.h | 1 - TAO/tao/debug.cpp | 1 - TAO/tao/debug.h | 3 -- 21 files changed, 138 insertions(+), 75 deletions(-) diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c index 46a3c7429c7..4f2161626ed 100644 --- a/TAO/ChangeLog-99c +++ b/TAO/ChangeLog-99c @@ -1,3 +1,47 @@ +Sat Jun 5 23:06:01 1999 Carlos O'Ryan + + * Sun/CC 5.0 works with TAO now! Partly because we don't use the + same templates than before and partly because we found work + arounds the other compiler bugs. + + * tao/Object_Adapter.h: + * tao/Object_Adapter.i: + * tao/Policy_Manager.h: + * tao/Policy_Manager.i: + Sun/CC was generating buggy code for the compiler-generated + default constructor of TAO_Policy_Current, TAO_POA_Current, + added explicit default constructors and now it is happy. + + * tao/Messaging_Policy_i.h: + * tao/Messaging_Policy_i.i: + The compiler-generated copy constructor was not working, added + an explicit one and now things are happy. + + * tao/DynUnion_i.cpp: + * tao/Sequence.h: + Added the ACE_TEMPLATE_SPECIALIZATION macro + + * tao/Operation_Table.h: + Made the opname_ field a "const char*" instead of just "char*" + to avoid warnings because we assign string literals to that + field. + + * tao/debug.cpp: + * tao/debug.h: + Removed unused variable + + * tao/CDR_Interpreter.cpp: + * tao/DynAnyC.h: + * tao/GIOP.h: + * tao/ObjectIDList.h: + * tao/PolicyC.h: + * tao/Request.h: + * tao/Services.h: + * tao/Stub.cpp: + * tao/corba.h: + Include "Sequence_T.h" directly from Sequence.h, is the ACE way + and it is easier to use. + Sat Jun 5 20:09:51 1999 Carlos O'Ryan * tao/ORB_Core.cpp: diff --git a/TAO/tao/CDR_Interpreter.cpp b/TAO/tao/CDR_Interpreter.cpp index c1aacc75c6c..8d12e0075b6 100644 --- a/TAO/tao/CDR_Interpreter.cpp +++ b/TAO/tao/CDR_Interpreter.cpp @@ -8,7 +8,6 @@ // CDR_Interpreter to workaround a Greenhills (1.8.8 and 1.8.9) // compiler bug. #include "tao/Sequence.h" -#include "tao/Sequence_T.h" #include "tao/CDR_Interpreter.h" #include "tao/Any.h" #include "tao/varout.h" diff --git a/TAO/tao/DynAnyC.h b/TAO/tao/DynAnyC.h index d2b1120d485..fd4053a08a5 100644 --- a/TAO/tao/DynAnyC.h +++ b/TAO/tao/DynAnyC.h @@ -34,7 +34,6 @@ #include "tao/ORB.h" #include "tao/Object.h" #include "tao/Sequence.h" -#include "tao/Sequence_T.h" #if defined (TAO_EXPORT_MACRO) #undef TAO_EXPORT_MACRO diff --git a/TAO/tao/DynUnion_i.cpp b/TAO/tao/DynUnion_i.cpp index 36e8d7ad937..6cba81f3497 100644 --- a/TAO/tao/DynUnion_i.cpp +++ b/TAO/tao/DynUnion_i.cpp @@ -1200,6 +1200,7 @@ TAO_DynUnion_i::get_any (CORBA::Environment &env) // Some specialized instantiations of the template functor defined in // DynUnion_i_T.cpp. +ACE_TEMPLATE_SPECIALIZATION CORBA::Boolean DU_Extractor::check_match ( const CORBA_Any& inside_any, @@ -1213,6 +1214,7 @@ DU_Extractor::check_match ( return member_struct.ref_ == arg_struct.ref_; } +ACE_TEMPLATE_SPECIALIZATION CORBA::Boolean DU_Extractor::check_match ( const CORBA_Any& inside_any, diff --git a/TAO/tao/GIOP.h b/TAO/tao/GIOP.h index 2a7e619772b..f817e9c8dce 100644 --- a/TAO/tao/GIOP.h +++ b/TAO/tao/GIOP.h @@ -37,7 +37,6 @@ #include "tao/corbafwd.h" #include "tao/Sequence.h" -#include "tao/Sequence_T.h" class TAO_Transport; class TAO_ORB_Core; diff --git a/TAO/tao/Messaging_Policy_i.h b/TAO/tao/Messaging_Policy_i.h index a3b03007d15..60996f4ff44 100644 --- a/TAO/tao/Messaging_Policy_i.h +++ b/TAO/tao/Messaging_Policy_i.h @@ -39,9 +39,12 @@ class TAO_Export TAO_RelativeRoundtripTimeoutPolicy_i : public POA_Messaging::Re // public: TAO_RelativeRoundtripTimeoutPolicy_i (PortableServer::POA_ptr poa, - const TimeBase::TimeT& relative_expiry); + const TimeBase::TimeT& relative_expiry); // Constructor + TAO_RelativeRoundtripTimeoutPolicy_i (const TAO_RelativeRoundtripTimeoutPolicy_i& rhs); + // Copy constructor + static CORBA::Policy_ptr create ( PortableServer::POA_ptr poa, const CORBA::Any& val, diff --git a/TAO/tao/Messaging_Policy_i.i b/TAO/tao/Messaging_Policy_i.i index 9b622cfe47d..a2d0f60e9ac 100644 --- a/TAO/tao/Messaging_Policy_i.i +++ b/TAO/tao/Messaging_Policy_i.i @@ -8,3 +8,11 @@ TAO_RelativeRoundtripTimeoutPolicy_i::TAO_RelativeRoundtripTimeoutPolicy_i ( relative_expiry_ (relative_expiry) { } + +ACE_INLINE +TAO_RelativeRoundtripTimeoutPolicy_i::TAO_RelativeRoundtripTimeoutPolicy_i ( + const TAO_RelativeRoundtripTimeoutPolicy_i& rhs) + : poa_ (PortableServer::POA::_duplicate (rhs.poa_)), + relative_expiry_ (rhs.relative_expiry_) +{ +} diff --git a/TAO/tao/ObjectIDList.h b/TAO/tao/ObjectIDList.h index 3d9aad56281..8bfc52b66b0 100644 --- a/TAO/tao/ObjectIDList.h +++ b/TAO/tao/ObjectIDList.h @@ -15,7 +15,6 @@ #include "tao/corba.h" #include "tao/Sequence.h" -#include "tao/Sequence_T.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once diff --git a/TAO/tao/Object_Adapter.h b/TAO/tao/Object_Adapter.h index 3de94e22955..e67915fd602 100644 --- a/TAO/tao/Object_Adapter.h +++ b/TAO/tao/Object_Adapter.h @@ -48,6 +48,8 @@ class TAO_POA_Current_Impl; class TAO_Export TAO_POA_Current : public POA_PortableServer::Current { public: + TAO_POA_Current (void); + // Constructor PortableServer::POA_ptr get_POA (CORBA_Environment &ACE_TRY_ENV); // Returns the POA on which the current request is being invoked. diff --git a/TAO/tao/Object_Adapter.i b/TAO/tao/Object_Adapter.i index 9e1253fee42..856d91fbf77 100644 --- a/TAO/tao/Object_Adapter.i +++ b/TAO/tao/Object_Adapter.i @@ -1,5 +1,11 @@ // $Id$ + +ACE_INLINE +TAO_POA_Current::TAO_POA_Current (void) +{ +} + ACE_INLINE ACE_Lock & TAO_Object_Adapter::lock (void) { diff --git a/TAO/tao/Operation_Table.h b/TAO/tao/Operation_Table.h index 916c74d0849..9eaa1ba8fda 100644 --- a/TAO/tao/Operation_Table.h +++ b/TAO/tao/Operation_Table.h @@ -29,7 +29,7 @@ class TAO_operation_db_entry // corresponding skeleton. A table of such entries is used to // initialize the different lookup strategies. public: - CORBA::String opname_; + const char* opname_; // operation name TAO_Skeleton skel_ptr_; diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h index 78ed8438b98..798f2618bdb 100644 --- a/TAO/tao/PolicyC.h +++ b/TAO/tao/PolicyC.h @@ -14,7 +14,6 @@ #include "tao/CurrentC.h" #include "tao/CDR.h" #include "tao/Sequence.h" -#include "tao/Sequence_T.h" class TAO_Export CORBA_PolicyError : public CORBA::UserException { diff --git a/TAO/tao/Policy_Manager.h b/TAO/tao/Policy_Manager.h index 6bbe24b1ac9..400377d7bfe 100644 --- a/TAO/tao/Policy_Manager.h +++ b/TAO/tao/Policy_Manager.h @@ -164,6 +164,9 @@ private: class TAO_Export TAO_Policy_Current : public POA_CORBA::PolicyCurrent { public: + TAO_Policy_Current (void); + // Constructor + CORBA::Policy_ptr get_policy ( CORBA::PolicyType policy, CORBA::Environment &ACE_TRY_ENV = diff --git a/TAO/tao/Policy_Manager.i b/TAO/tao/Policy_Manager.i index 4fe43c15f29..8808dd279ac 100644 --- a/TAO/tao/Policy_Manager.i +++ b/TAO/tao/Policy_Manager.i @@ -53,6 +53,11 @@ TAO_Policy_Manager::relative_roundtrip_timeout (void) const // **************************************************************** +ACE_INLINE +TAO_Policy_Current::TAO_Policy_Current (void) +{ +} + ACE_INLINE CORBA::Policy_ptr TAO_Policy_Current_Impl::get_policy ( CORBA::PolicyType policy, diff --git a/TAO/tao/Request.h b/TAO/tao/Request.h index 3adf86ba587..01bb77c3532 100644 --- a/TAO/tao/Request.h +++ b/TAO/tao/Request.h @@ -31,7 +31,6 @@ #include "tao/Environment.h" #include "tao/Context.h" #include "tao/Sequence.h" -#include "tao/Sequence_T.h" class TAO_Export CORBA_Request { diff --git a/TAO/tao/Sequence.h b/TAO/tao/Sequence.h index b94f14e6513..dc37b17bd64 100644 --- a/TAO/tao/Sequence.h +++ b/TAO/tao/Sequence.h @@ -335,6 +335,7 @@ template class TAO_Unbounded_Sequence; // The template itself requires this file so every user of the // template should also see the specialization. +ACE_TEMPLATE_SPECIALIZATION class TAO_Export TAO_Unbounded_Sequence : public TAO_Unbounded_Base_Sequence { // = TITLE @@ -358,7 +359,7 @@ public: CORBA::ULong length, CORBA::Octet *data, CORBA::Boolean release = 0); - ~TAO_Unbounded_Sequence (void); + virtual ~TAO_Unbounded_Sequence (void); // see TAO_Unbounded_Sequence in "Sequence_T.h" TAO_Unbounded_Sequence (const TAO_Unbounded_Sequence &); @@ -446,4 +447,6 @@ extern TAO_Export int operator!= (const TAO_Unbounded_Sequence &l, #include "tao/Sequence.i" #endif /* __ACE_INLINE__ */ +#include "tao/Sequence_T.h" + #endif /* TAO_SEQUENCE_H */ diff --git a/TAO/tao/Services.h b/TAO/tao/Services.h index 6c7ce1cb4d2..2d8029e8aed 100644 --- a/TAO/tao/Services.h +++ b/TAO/tao/Services.h @@ -19,7 +19,6 @@ #define TAO_SERVICES_H #include "tao/Sequence.h" -#include "tao/Sequence_T.h" #if defined(_MSC_VER) #pragma warning(disable:4250) @@ -31,11 +30,11 @@ struct TAO_Export CORBA_ServiceDetail #if !defined (_CORBA_SERVICEDETAIL__TAO_SEQ_OCTET_CH_) #define _CORBA_SERVICEDETAIL__TAO_SEQ_OCTET_CH_ - + // ************************************************************* // _tao_seq_Octet // ************************************************************* - + class _tao_seq_Octet : public TAO_Unbounded_Sequence { public: @@ -49,7 +48,7 @@ struct TAO_Export CORBA_ServiceDetail ); _tao_seq_Octet (const _tao_seq_Octet &); // copy ctor ~_tao_seq_Octet (void); // dtor - + #if defined(TAO_NO_COPY_OCTET_SEQUENCES) _tao_seq_Octet ( CORBA::ULong length, @@ -65,11 +64,11 @@ struct TAO_Export CORBA_ServiceDetail #if !defined (_CORBA_SERVICEDETAIL__TAO_SEQ_OCTET___VAR_CH_) #define _CORBA_SERVICEDETAIL__TAO_SEQ_OCTET___VAR_CH_ - + // ************************************************************* // class CORBA::ServiceDetail::_tao_seq_Octet_var // ************************************************************* - + class _tao_seq_Octet_var { public: @@ -77,12 +76,12 @@ struct TAO_Export CORBA_ServiceDetail _tao_seq_Octet_var (_tao_seq_Octet *); _tao_seq_Octet_var (const _tao_seq_Octet_var &); // copy constructor ~_tao_seq_Octet_var (void); // destructor - + _tao_seq_Octet_var &operator= (_tao_seq_Octet *); _tao_seq_Octet_var &operator= (const _tao_seq_Octet_var &); _tao_seq_Octet *operator-> (void); const _tao_seq_Octet *operator-> (void) const; - + operator const _tao_seq_Octet &() const; operator _tao_seq_Octet &(); operator _tao_seq_Octet &() const; @@ -93,7 +92,7 @@ struct TAO_Export CORBA_ServiceDetail _tao_seq_Octet *&out (void); _tao_seq_Octet *_retn (void); _tao_seq_Octet *ptr (void) const; - + private: _tao_seq_Octet *ptr_; }; @@ -136,12 +135,12 @@ class CORBA_ServiceDetail_var CORBA_ServiceDetail_var (CORBA_ServiceDetail *); CORBA_ServiceDetail_var (const CORBA_ServiceDetail_var &); // copy constructor ~CORBA_ServiceDetail_var (void); // destructor - + CORBA_ServiceDetail_var &operator= (CORBA_ServiceDetail *); CORBA_ServiceDetail_var &operator= (const CORBA_ServiceDetail_var &); CORBA_ServiceDetail *operator-> (void); const CORBA_ServiceDetail *operator-> (void) const; - + operator const CORBA_ServiceDetail &() const; operator CORBA_ServiceDetail &(); operator CORBA_ServiceDetail &() const; @@ -151,7 +150,7 @@ class CORBA_ServiceDetail_var CORBA_ServiceDetail *&out (void); CORBA_ServiceDetail *_retn (void); CORBA_ServiceDetail *ptr (void) const; - + private: CORBA_ServiceDetail *ptr_; }; @@ -167,7 +166,7 @@ class CORBA_ServiceDetail_out operator CORBA_ServiceDetail *&(); CORBA_ServiceDetail *&ptr (void); CORBA_ServiceDetail *operator-> (void); - + private: CORBA_ServiceDetail *&ptr_; // assignment from T_var not allowed @@ -176,17 +175,17 @@ class CORBA_ServiceDetail_out struct CORBA_ServiceInformation { - + #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - + #if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CH_) #define __TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CH_ - + class _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption : public TAO_Unbounded_Base_Sequence { public: // = Initialization and termination methods. - + _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (void); // Default constructor. _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (CORBA::ULong maximum); _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (CORBA::ULong maximum, @@ -196,7 +195,7 @@ struct CORBA_ServiceInformation _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (const _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption & rhs); _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption &operator= (const _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption &rhs); virtual ~_TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption (void); // Dtor. - + // = Accessors. CORBA::ULong &operator[] (CORBA::ULong i); const CORBA::ULong &operator[] (CORBA::ULong i) const; @@ -206,7 +205,7 @@ struct CORBA_ServiceInformation virtual void _allocate_buffer (CORBA::ULong length); virtual void _deallocate_buffer (void); // Implement the TAO_Base_Sequence methods (see Sequence.h) - + CORBA::ULong *get_buffer (CORBA::Boolean orphan = 0); const CORBA::ULong *get_buffer (void) const; void replace (CORBA::ULong max, @@ -214,19 +213,19 @@ struct CORBA_ServiceInformation CORBA::ULong *data, CORBA::Boolean release); }; - + #endif /* end #if !defined */ - - + + #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - + #if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CH_) #define _CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION_CH_ - + // ************************************************************* // _tao_seq_ServiceOption // ************************************************************* - + class _tao_seq_ServiceOption : public #if !defined (TAO_USE_SEQUENCE_TEMPLATES) _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceOption @@ -248,18 +247,18 @@ struct CORBA_ServiceInformation }; typedef _tao_seq_ServiceOption *_tao_seq_ServiceOption_ptr; static CORBA::TypeCode_ptr _tc__tao_seq_ServiceOption; - - + + #endif /* end #if !defined */ - - + + #if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION___VAR_CH_) #define _CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION___VAR_CH_ // ************************************************************* // class CORBA::ServiceInformation::_tao_seq_ServiceOption_var // ************************************************************* - + class _tao_seq_ServiceOption_var { public: @@ -271,7 +270,7 @@ struct CORBA_ServiceInformation _tao_seq_ServiceOption_var &operator= (const _tao_seq_ServiceOption_var &); _tao_seq_ServiceOption *operator-> (void); const _tao_seq_ServiceOption *operator-> (void) const; - + operator const _tao_seq_ServiceOption &() const; operator _tao_seq_ServiceOption &(); operator _tao_seq_ServiceOption &() const; @@ -286,14 +285,14 @@ struct CORBA_ServiceInformation private: _tao_seq_ServiceOption *ptr_; }; - - + + #endif /* end #if !defined */ - - + + #if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION___OUT_CH_) #define _CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEOPTION___OUT_CH_ - + class _tao_seq_ServiceOption_out { public: @@ -306,28 +305,28 @@ struct CORBA_ServiceInformation _tao_seq_ServiceOption *&ptr (void); _tao_seq_ServiceOption *operator-> (void); CORBA::ServiceOption &operator[] (CORBA::ULong index); - + private: _tao_seq_ServiceOption *&ptr_; // assignment from T_var not allowed void operator= (const _tao_seq_ServiceOption_var &); }; - - + + #endif /* end #if !defined */ - + _tao_seq_ServiceOption service_options; - + #if !defined (TAO_USE_SEQUENCE_TEMPLATES) - + #if !defined (__TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CH_) #define __TAO_UNBOUNDED_SEQUENCE_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CH_ - + class _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail : public TAO_Unbounded_Base_Sequence { public: // = Initialization and termination methods. - + _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (void); // Default constructor. _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (CORBA::ULong maximum); _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail (CORBA::ULong maximum, @@ -346,7 +345,7 @@ struct CORBA_ServiceInformation virtual void _allocate_buffer (CORBA::ULong length); virtual void _deallocate_buffer (void); // Implement the TAO_Base_Sequence methods (see Sequence.h) - + CORBA_ServiceDetail *get_buffer (CORBA::Boolean orphan = 0); const CORBA_ServiceDetail *get_buffer (void) const; void replace (CORBA::ULong max, @@ -354,18 +353,18 @@ struct CORBA_ServiceInformation CORBA_ServiceDetail *data, CORBA::Boolean release); }; - + #endif /* end #if !defined */ - + #endif /* !TAO_USE_SEQUENCE_TEMPLATES */ - + #if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CH_) #define _CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL_CH_ - + // ************************************************************* // _tao_seq_ServiceDetail // ************************************************************* - + class _tao_seq_ServiceDetail : public #if !defined (TAO_USE_SEQUENCE_TEMPLATES) _TAO_Unbounded_Sequence_CORBA_ServiceInformation__tao_seq_ServiceDetail @@ -387,17 +386,17 @@ struct CORBA_ServiceInformation }; typedef _tao_seq_ServiceDetail *_tao_seq_ServiceDetail_ptr; static CORBA::TypeCode_ptr _tc__tao_seq_ServiceDetail; - - + + #endif /* end #if !defined */ - + #if !defined (_CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL___VAR_CH_) #define _CORBA_SERVICEINFORMATION__TAO_SEQ_SERVICEDETAIL___VAR_CH_ - + // ************************************************************* // class CORBA::ServiceInformation::_tao_seq_ServiceDetail_var // ************************************************************* - + class _tao_seq_ServiceDetail_var { public: @@ -466,12 +465,12 @@ class CORBA_ServiceInformation_var CORBA_ServiceInformation_var (CORBA_ServiceInformation *); CORBA_ServiceInformation_var (const CORBA_ServiceInformation_var &); // copy constructor ~CORBA_ServiceInformation_var (void); // destructor - + CORBA_ServiceInformation_var &operator= (CORBA_ServiceInformation *); CORBA_ServiceInformation_var &operator= (const CORBA_ServiceInformation_var &); CORBA_ServiceInformation *operator-> (void); const CORBA_ServiceInformation *operator-> (void) const; - + operator const CORBA_ServiceInformation &() const; operator CORBA_ServiceInformation &(); operator CORBA_ServiceInformation &() const; @@ -481,7 +480,7 @@ class CORBA_ServiceInformation_var CORBA_ServiceInformation *&out (void); CORBA_ServiceInformation *_retn (void); CORBA_ServiceInformation *ptr (void) const; - + private: CORBA_ServiceInformation *ptr_; }; @@ -494,11 +493,11 @@ class CORBA_ServiceInformation_out CORBA_ServiceInformation_out (const CORBA_ServiceInformation_out &); CORBA_ServiceInformation_out &operator= (const CORBA_ServiceInformation_out &); CORBA_ServiceInformation_out &operator= (CORBA_ServiceInformation *); - + operator CORBA_ServiceInformation *&(); CORBA_ServiceInformation *&ptr (void); CORBA_ServiceInformation *operator-> (void); - + private: CORBA_ServiceInformation *&ptr_; // assignment from T_var not allowed diff --git a/TAO/tao/Stub.cpp b/TAO/tao/Stub.cpp index 5fc39905f91..535fe466525 100644 --- a/TAO/tao/Stub.cpp +++ b/TAO/tao/Stub.cpp @@ -12,7 +12,6 @@ #include "tao/Stub.h" #include "tao/Sequence.h" -#include "tao/Sequence_T.h" #include "tao/Object.h" #include "tao/GIOP.h" #include "tao/NVList.h" diff --git a/TAO/tao/corba.h b/TAO/tao/corba.h index 75af0b5f16d..75568c5c64a 100644 --- a/TAO/tao/corba.h +++ b/TAO/tao/corba.h @@ -74,7 +74,6 @@ #include "tao/Managed_Types.h" #include "tao/Sequence.h" -#include "tao/Sequence_T.h" #include "tao/Object_KeyC.h" #include "tao/Union.h" #include "tao/ValueBase.h" diff --git a/TAO/tao/debug.cpp b/TAO/tao/debug.cpp index 1e88b85c576..f78bfe0e602 100644 --- a/TAO/tao/debug.cpp +++ b/TAO/tao/debug.cpp @@ -19,4 +19,3 @@ ACE_RCSID(tao, debug, "$Id$") TAO_Export u_int TAO_debug_level = 0; TAO_Export u_int TAO_orbdebug = 0; -TAO_Export char *TAO_debug_filter = "l"; diff --git a/TAO/tao/debug.h b/TAO/tao/debug.h index 27f1fc3fda6..9c4f17217e8 100644 --- a/TAO/tao/debug.h +++ b/TAO/tao/debug.h @@ -35,7 +35,4 @@ extern TAO_Export u_int TAO_debug_level; // debug messages on (1) or off (0) extern TAO_Export u_int TAO_orbdebug; -// set by getopt -extern TAO_Export char *TAO_debug_filter; - #endif /* TAO_DEBUG_H */ -- cgit v1.2.1