summaryrefslogtreecommitdiff
path: root/TAO
diff options
context:
space:
mode:
Diffstat (limited to 'TAO')
-rw-r--r--TAO/tao/DynAnyC.cpp4
-rw-r--r--TAO/tao/DynAnyC.h2
-rw-r--r--TAO/tao/DynArray_i.cpp4
-rw-r--r--TAO/tao/DynArray_i.h2
-rw-r--r--TAO/tao/DynSequence_i.cpp4
-rw-r--r--TAO/tao/DynSequence_i.h2
-rw-r--r--TAO/tao/GIOPC.h8
-rw-r--r--TAO/tao/GIOP_Server_Request.cpp4
-rw-r--r--TAO/tao/IOPC.h2
-rw-r--r--TAO/tao/IORC.cpp4
-rw-r--r--TAO/tao/IORC.h9
-rw-r--r--TAO/tao/ImplRepoC.cpp12
-rw-r--r--TAO/tao/ImplRepoC.h48
-rw-r--r--TAO/tao/Interceptor.cpp4
-rw-r--r--TAO/tao/Interceptor.h4
-rw-r--r--TAO/tao/Interceptor.i4
-rw-r--r--TAO/tao/Invocation.cpp2
-rw-r--r--TAO/tao/MessagingC.h3
-rw-r--r--TAO/tao/ORB.h1
-rw-r--r--TAO/tao/Object_KeyC.h1
-rw-r--r--TAO/tao/POAC.cpp52
-rw-r--r--TAO/tao/POAC.h157
-rw-r--r--TAO/tao/PolicyC.h2
-rw-r--r--TAO/tao/Request.h1
-rw-r--r--TAO/tao/Services.h1
-rw-r--r--TAO/tao/TAO.dsp23
-rw-r--r--TAO/tao/corbafwd.h6
27 files changed, 78 insertions, 288 deletions
diff --git a/TAO/tao/DynAnyC.cpp b/TAO/tao/DynAnyC.cpp
index 07ea897c72f..4db23a092be 100644
--- a/TAO/tao/DynAnyC.cpp
+++ b/TAO/tao/DynAnyC.cpp
@@ -1296,7 +1296,7 @@ CORBA_DynSequence::length (CORBA::ULong,
{
}
-CORBA_AnySeq_ptr
+CORBA_AnySeq *
CORBA_DynSequence::get_elements (CORBA::Environment &)
{
return 0;
@@ -1398,7 +1398,7 @@ CORBA_DynArray_ptr CORBA_DynArray::_nil (void)
return (CORBA_DynArray_ptr) NULL;
} // end of _nil
-CORBA_AnySeq_ptr
+CORBA_AnySeq *
CORBA_DynArray::get_elements (CORBA::Environment &)
{
return 0;
diff --git a/TAO/tao/DynAnyC.h b/TAO/tao/DynAnyC.h
index cf1933ed0bd..eadb8c2bee5 100644
--- a/TAO/tao/DynAnyC.h
+++ b/TAO/tao/DynAnyC.h
@@ -194,7 +194,7 @@ public:
// = TAO extension
static CORBA::Exception *_alloc (void);
- }; // exception CORBA_DynAny::TypeMismatch
+ }; // exception CORBA_DynAny::TypeMismatch
static CORBA::TypeCode_ptr _tc_TypeMismatch;
diff --git a/TAO/tao/DynArray_i.cpp b/TAO/tao/DynArray_i.cpp
index a2c7db9d9e5..7da431b948d 100644
--- a/TAO/tao/DynArray_i.cpp
+++ b/TAO/tao/DynArray_i.cpp
@@ -132,7 +132,7 @@ TAO_DynArray_i::~TAO_DynArray_i (void)
// Functions specific to DynArray
-CORBA_AnySeq_ptr
+CORBA_AnySeq *
TAO_DynArray_i::get_elements (CORBA::Environment& ACE_TRY_ENV)
{
CORBA::ULong length = this->da_members_.size ();
@@ -141,7 +141,7 @@ TAO_DynArray_i::get_elements (CORBA::Environment& ACE_TRY_ENV)
return 0;
// Arg only sets maximum, so...
- CORBA_AnySeq_ptr elements;
+ CORBA_AnySeq *elements;
ACE_NEW_THROW_EX (elements,
CORBA_AnySeq (length),
diff --git a/TAO/tao/DynArray_i.h b/TAO/tao/DynArray_i.h
index b24affe8886..8887dfdc60d 100644
--- a/TAO/tao/DynArray_i.h
+++ b/TAO/tao/DynArray_i.h
@@ -48,7 +48,7 @@ public:
// = Functions specific to DynArray
- CORBA_AnySeq_ptr get_elements (CORBA::Environment &ACE_TRY_ENV =
+ CORBA_AnySeq *get_elements (CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ());
// Assign/dump elements using IDL defined type AnySeq
diff --git a/TAO/tao/DynSequence_i.cpp b/TAO/tao/DynSequence_i.cpp
index a8e1a120baa..baaebc3dd8f 100644
--- a/TAO/tao/DynSequence_i.cpp
+++ b/TAO/tao/DynSequence_i.cpp
@@ -136,7 +136,7 @@ TAO_DynSequence_i::length (CORBA::ULong length,
this->da_members_.size (length);
}
-CORBA_AnySeq_ptr
+CORBA_AnySeq *
TAO_DynSequence_i::get_elements (CORBA::Environment& ACE_TRY_ENV)
{
CORBA::ULong length = this->da_members_.size ();
@@ -144,7 +144,7 @@ TAO_DynSequence_i::get_elements (CORBA::Environment& ACE_TRY_ENV)
if (length == 0)
return 0;
- CORBA_AnySeq_ptr elements;
+ CORBA_AnySeq *elements;
ACE_NEW_THROW_EX (elements,
CORBA_AnySeq (length),
CORBA::NO_MEMORY ());
diff --git a/TAO/tao/DynSequence_i.h b/TAO/tao/DynSequence_i.h
index efcf3017a15..0f8b8b477a0 100644
--- a/TAO/tao/DynSequence_i.h
+++ b/TAO/tao/DynSequence_i.h
@@ -57,7 +57,7 @@ public:
TAO_default_environment ());
// Set length of sequence.
- CORBA_AnySeq_ptr get_elements (CORBA::Environment &ACE_TRY_ENV =
+ CORBA_AnySeq *get_elements (CORBA::Environment &ACE_TRY_ENV =
TAO_default_environment ());
// Get elements using IDL defined type AnySeq.
diff --git a/TAO/tao/GIOPC.h b/TAO/tao/GIOPC.h
index e3f5d36dcb7..741b36933bc 100644
--- a/TAO/tao/GIOPC.h
+++ b/TAO/tao/GIOPC.h
@@ -80,13 +80,11 @@ TAO_NAMESPACE GIOP
struct IORAddressingInfo;
class IORAddressingInfo_var;
- typedef IORAddressingInfo* IORAddressingInfo_ptr;
struct TAO_Export IORAddressingInfo
{
#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
- typedef IORAddressingInfo_ptr _ptr_type;
typedef IORAddressingInfo_var _var_type;
#endif /* ! __GNUC__ || g++ >= 2.8 */
static void _tao_any_destructor (void*);
@@ -145,9 +143,8 @@ TAO_NAMESPACE GIOP
class TargetAddress;
class TargetAddress_var;
- typedef TargetAddress* TargetAddress_ptr;
-
- class TAO_Export TargetAddress: public TAO_Base_Union
+
+ class TAO_Export TargetAddress: public TAO_Base_Union
{
public:
TargetAddress (void); // default constructor
@@ -159,7 +156,6 @@ TAO_NAMESPACE GIOP
CORBA::Short _d (void) const;
#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
- typedef TargetAddress_ptr _ptr_type;
typedef TargetAddress_var _var_type;
#endif /* ! __GNUC__ || g++ >= 2.8 */
static void _tao_any_destructor (void*);
diff --git a/TAO/tao/GIOP_Server_Request.cpp b/TAO/tao/GIOP_Server_Request.cpp
index ae12a690a93..15dcba723f0 100644
--- a/TAO/tao/GIOP_Server_Request.cpp
+++ b/TAO/tao/GIOP_Server_Request.cpp
@@ -193,8 +193,8 @@ TAO_GIOP_ServerRequest::set_exception (const CORBA::Any &value,
#if !defined (TAO_HAS_MINIMUM_CORBA)
// Try to narrow to ForwardRequest
- PortableServer::ForwardRequest_ptr forward_request =
- (PortableServer::ForwardRequest_ptr)0;
+ PortableServer::ForwardRequest *forward_request =
+ (PortableServer::ForwardRequest *)0;
if (value.value ())
{
diff --git a/TAO/tao/IOPC.h b/TAO/tao/IOPC.h
index d680f9981f7..f2a912ce5be 100644
--- a/TAO/tao/IOPC.h
+++ b/TAO/tao/IOPC.h
@@ -242,7 +242,6 @@ TAO_NAMESPACE IOP
#endif /* TAO_NO_COPY_OCTET_SEQUENCE */
};
- typedef _tao_seq_Octet *_tao_seq_Octet_ptr;
_tao_seq_Octet component_data;
};
@@ -444,7 +443,6 @@ TAO_NAMESPACE IOP
#endif /* TAO_NO_COPY_OCTET_SEQUENCE */
};
- typedef _tao_seq_Octet *_tao_seq_Octet_ptr;
_tao_seq_Octet context_data;
};
diff --git a/TAO/tao/IORC.cpp b/TAO/tao/IORC.cpp
index 659ccd25469..6a4ecc07c67 100644
--- a/TAO/tao/IORC.cpp
+++ b/TAO/tao/IORC.cpp
@@ -173,11 +173,11 @@ TAO_IOP::TAO_IOR_Manipulation::NotFound::operator= (const TAO_IOP::TAO_IOR_Manip
}
// narrow
-TAO_IOP::TAO_IOR_Manipulation::NotFound_ptr
+TAO_IOP::TAO_IOR_Manipulation::NotFound *
TAO_IOP::TAO_IOR_Manipulation::NotFound::_narrow (CORBA::Exception *exc)
{
if (!ACE_OS::strcmp ("IDL:TAO_IOP/TAO_IOR_Manipulation/NotFound:1.0", exc->_id ())) // same type
- return ACE_dynamic_cast (TAO_IOP::TAO_IOR_Manipulation::NotFound_ptr, exc);
+ return ACE_dynamic_cast (TAO_IOP::TAO_IOR_Manipulation::NotFound *, exc);
else
return 0;
}
diff --git a/TAO/tao/IORC.h b/TAO/tao/IORC.h
index 86ee3677998..6f030109630 100644
--- a/TAO/tao/IORC.h
+++ b/TAO/tao/IORC.h
@@ -169,15 +169,6 @@ TAO_NAMESPACE TAO_IOP
#endif /* end #if !defined */
-#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_NOTFOUND___PTR_CH_)
-#define _TAO_IOP_TAO_IOR_MANIPULATION_NOTFOUND___PTR_CH_
-
- class NotFound;
- typedef NotFound *NotFound_ptr;
-
-#endif /* end #if !defined */
-
-
#if !defined (_TAO_IOP_TAO_IOR_MANIPULATION_NOTFOUND_CH_)
#define _TAO_IOP_TAO_IOR_MANIPULATION_NOTFOUND_CH_
diff --git a/TAO/tao/ImplRepoC.cpp b/TAO/tao/ImplRepoC.cpp
index 222aecb15fe..42459f1ec92 100644
--- a/TAO/tao/ImplRepoC.cpp
+++ b/TAO/tao/ImplRepoC.cpp
@@ -1024,11 +1024,11 @@ ImplementationRepository::Administration::AlreadyRegistered::operator= (const ::
}
// narrow
-ImplementationRepository::Administration::AlreadyRegistered_ptr
+ImplementationRepository::Administration::AlreadyRegistered *
ImplementationRepository::Administration::AlreadyRegistered::_narrow (CORBA::Exception *exc)
{
if (!ACE_OS::strcmp ("IDL:ImplementationRepository/Administration/AlreadyRegistered:1.0", exc->_id ())) // same type
- return ACE_dynamic_cast (AlreadyRegistered_ptr, exc);
+ return ACE_dynamic_cast (AlreadyRegistered *, exc);
else
return 0;
}
@@ -1112,11 +1112,11 @@ ImplementationRepository::Administration::CannotActivate::operator= (const ::Imp
}
// narrow
-ImplementationRepository::Administration::CannotActivate_ptr
+ImplementationRepository::Administration::CannotActivate *
ImplementationRepository::Administration::CannotActivate::_narrow (CORBA::Exception *exc)
{
if (!ACE_OS::strcmp ("IDL:ImplementationRepository/Administration/CannotActivate:1.0", exc->_id ())) // same type
- return ACE_dynamic_cast (CannotActivate_ptr, exc);
+ return ACE_dynamic_cast (CannotActivate *, exc);
else
return 0;
}
@@ -1209,11 +1209,11 @@ ImplementationRepository::Administration::NotFound::operator= (const ::Implement
}
// narrow
-ImplementationRepository::Administration::NotFound_ptr
+ImplementationRepository::Administration::NotFound *
ImplementationRepository::Administration::NotFound::_narrow (CORBA::Exception *exc)
{
if (!ACE_OS::strcmp ("IDL:ImplementationRepository/Administration/NotFound:1.0", exc->_id ())) // same type
- return ACE_dynamic_cast (NotFound_ptr, exc);
+ return ACE_dynamic_cast (NotFound *, exc);
else
return 0;
}
diff --git a/TAO/tao/ImplRepoC.h b/TAO/tao/ImplRepoC.h
index 23b5bd2ec1d..477de802547 100644
--- a/TAO/tao/ImplRepoC.h
+++ b/TAO/tao/ImplRepoC.h
@@ -372,7 +372,6 @@ TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_Address;
class EnvironmentList;
class EnvironmentList_var;
-typedef EnvironmentList* EnvironmentList_ptr;
// *************************************************************
// EnvironmentList
@@ -399,7 +398,6 @@ public:
static void _tao_any_destructor (void*);
#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
- typedef EnvironmentList_ptr _ptr_type;
typedef EnvironmentList_var _var_type;
#endif /* ! __GNUC__ || g++ >= 2.8 */
@@ -669,7 +667,6 @@ TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ServerInformation;
class ServerInformationList;
class ServerInformationList_var;
-typedef ServerInformationList* ServerInformationList_ptr;
// *************************************************************
// ServerInformationList
@@ -696,7 +693,6 @@ public:
static void _tao_any_destructor (void*);
#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
- typedef ServerInformationList_ptr _ptr_type;
typedef ServerInformationList_var _var_type;
#endif /* ! __GNUC__ || g++ >= 2.8 */
@@ -934,16 +930,6 @@ public:
static void _tao_any_destructor (void*);
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION_ALREADYREGISTERED___PTR_CH_)
-#define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION_ALREADYREGISTERED___PTR_CH_
-
- class AlreadyRegistered;
- typedef AlreadyRegistered *AlreadyRegistered_ptr;
-
-#endif /* end #if !defined */
-
-
#if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION_ALREADYREGISTERED_CH_)
#define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION_ALREADYREGISTERED_CH_
@@ -951,11 +937,6 @@ public:
{
public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
- typedef AlreadyRegistered_ptr _ptr_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-
AlreadyRegistered (void); // default ctor
AlreadyRegistered (const AlreadyRegistered &); // copy ctor
~AlreadyRegistered (void);
@@ -985,16 +966,6 @@ public:
#endif /* end #if !defined */
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CANNOTACTIVATE___PTR_CH_)
-#define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CANNOTACTIVATE___PTR_CH_
-
- class CannotActivate;
- typedef CannotActivate *CannotActivate_ptr;
-
-#endif /* end #if !defined */
-
-
#if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CANNOTACTIVATE_CH_)
#define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION_CANNOTACTIVATE_CH_
@@ -1002,10 +973,6 @@ public:
{
public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
- typedef CannotActivate_ptr _ptr_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
TAO_String_Manager reason;
CannotActivate (void); // default ctor
@@ -1040,16 +1007,6 @@ public:
#endif /* end #if !defined */
-
-#if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION_NOTFOUND___PTR_CH_)
-#define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION_NOTFOUND___PTR_CH_
-
- class NotFound;
- typedef NotFound *NotFound_ptr;
-
-#endif /* end #if !defined */
-
-
#if !defined (_IMPLEMENTATIONREPOSITORY_ADMINISTRATION_NOTFOUND_CH_)
#define _IMPLEMENTATIONREPOSITORY_ADMINISTRATION_NOTFOUND_CH_
@@ -1057,11 +1014,6 @@ public:
{
public:
-#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
- typedef NotFound_ptr _ptr_type;
-#endif /* ! __GNUC__ || g++ >= 2.8 */
-
-
NotFound (void); // default ctor
NotFound (const NotFound &); // copy ctor
~NotFound (void);
diff --git a/TAO/tao/Interceptor.cpp b/TAO/tao/Interceptor.cpp
index aa22b9582ec..833ace63368 100644
--- a/TAO/tao/Interceptor.cpp
+++ b/TAO/tao/Interceptor.cpp
@@ -52,7 +52,7 @@ ServerRequestInterceptor::exception_occurred (CORBA::ULong,
CORBA::Object_ptr,
const char *,
//IOP::ServiceContextList &,
- //CORBA::Exception_ptr &,
+ //CORBA::Exception *&,
PortableInterceptor::Cookies &,
CORBA::Environment &)
{
@@ -91,7 +91,7 @@ ClientRequestInterceptor::exception_occurred (CORBA::ULong,
CORBA::Object_ptr,
const char *,
//IOP::ServiceContextList &,
- //CORBA::Exception_ptr &,
+ //CORBA::Exception *&,
PortableInterceptor::Cookies &,
CORBA::Environment &)
{
diff --git a/TAO/tao/Interceptor.h b/TAO/tao/Interceptor.h
index 4239f34ae77..322fe7d00ed 100644
--- a/TAO/tao/Interceptor.h
+++ b/TAO/tao/Interceptor.h
@@ -97,7 +97,7 @@ public:
CORBA::Object_ptr,
const char *,
//IOP::ServiceContextList &,
- //CORBA::Exception_ptr &,
+ //CORBA::Exception *&,
PortableInterceptor::Cookies &,
CORBA::Environment &);
@@ -151,7 +151,7 @@ public:
CORBA::Object_ptr,
const char *,
//IOP::ServiceContextList &,
- //CORBA::Exception_ptr &,
+ //CORBA::Exception *&,
PortableInterceptor::Cookies &,
CORBA::Environment &);
diff --git a/TAO/tao/Interceptor.i b/TAO/tao/Interceptor.i
index 3b96da07ace..91ba9edffeb 100644
--- a/TAO/tao/Interceptor.i
+++ b/TAO/tao/Interceptor.i
@@ -71,7 +71,7 @@ exception_occurred (CORBA::ULong request_id,
CORBA::Object_ptr objref,
const char *operation,
//IOP::ServiceContextList &,
- //CORBA::Exception_ptr &,
+ //CORBA::Exception *&,
PortableInterceptor::Cookies &cookies,
CORBA::Environment &ACE_TRY_ENV)
{
@@ -154,7 +154,7 @@ exception_occurred (CORBA::ULong request_id,
CORBA::Object_ptr objref,
const char *operation,
//IOP::ServiceContextList &,
- //CORBA::Exception_ptr &,
+ //CORBA::Exception *&,
PortableInterceptor::Cookies &cookies,
CORBA::Environment &ACE_TRY_ENV)
{
diff --git a/TAO/tao/Invocation.cpp b/TAO/tao/Invocation.cpp
index 3cee91ee6ff..b127c2a6f82 100644
--- a/TAO/tao/Invocation.cpp
+++ b/TAO/tao/Invocation.cpp
@@ -671,7 +671,7 @@ TAO_GIOP_Twoway_Invocation::invoke (TAO_Exception_Data *excepts,
continue;
// match
- CORBA::Exception_ptr exception = excepts[i].alloc ();
+ CORBA::Exception *exception = excepts[i].alloc ();
if (exception == 0)
ACE_THROW_RETURN (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE,
diff --git a/TAO/tao/MessagingC.h b/TAO/tao/MessagingC.h
index 5688d9ff7c2..85511ce222f 100644
--- a/TAO/tao/MessagingC.h
+++ b/TAO/tao/MessagingC.h
@@ -1454,7 +1454,6 @@ TAO_NAMESPACE Messaging
#endif /* TAO_NO_COPY_OCTET_SEQUENCE */
};
- typedef _tao_seq_Octet *_tao_seq_Octet_ptr;
static CORBA::TypeCode_ptr _tc__tao_seq_Octet;
_tao_seq_Octet pvalue;
@@ -1699,7 +1698,6 @@ TAO_NAMESPACE Messaging
// *************************************************************
class _tao_seq_Octet;
class _tao_seq_Octet_var;
- typedef _tao_seq_Octet* _tao_seq_Octet_ptr;
class TAO_Export _tao_seq_Octet : public
#if !defined (TAO_USE_SEQUENCE_TEMPLATES)
@@ -1721,7 +1719,6 @@ TAO_NAMESPACE Messaging
~_tao_seq_Octet (void); // dtor
#if !defined(__GNUC__) || !defined (ACE_HAS_GNUG_PRE_2_8)
- typedef _tao_seq_Octet_ptr _ptr_type;
typedef _tao_seq_Octet_var _var_type;
#endif /* ! __GNUC__ || g++ >= 2.8 */
diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h
index 44f313c6c3f..0a950c3ac03 100644
--- a/TAO/tao/ORB.h
+++ b/TAO/tao/ORB.h
@@ -410,7 +410,6 @@ public:
// which is an argument of send_multiple_requests_*().
// See Request.{h,i,cpp} for definitions.
typedef CORBA_ORB_RequestSeq RequestSeq;
- typedef CORBA_ORB_RequestSeq_ptr RequestSeq_ptr;
typedef CORBA_ORB_RequestSeq_var RequestSeq_var;
typedef CORBA_ORB_RequestSeq_out RequestSeq_out;
diff --git a/TAO/tao/Object_KeyC.h b/TAO/tao/Object_KeyC.h
index 509a0a4b75b..2070672cacd 100644
--- a/TAO/tao/Object_KeyC.h
+++ b/TAO/tao/Object_KeyC.h
@@ -34,7 +34,6 @@ class TAO_Export TAO_ObjectKey : public TAO_Unbounded_Sequence<CORBA::Octet>
//
public:
#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
- typedef TAO_ObjectKey_ptr _ptr_type;
typedef TAO_ObjectKey_var _var_type;
#endif /* __GNUC__ */
diff --git a/TAO/tao/POAC.cpp b/TAO/tao/POAC.cpp
index c578c0b354e..8c5bf6015da 100644
--- a/TAO/tao/POAC.cpp
+++ b/TAO/tao/POAC.cpp
@@ -124,11 +124,11 @@ void PortableServer::ForwardRequest::_tao_decode (TAO_InputCDR &cdr,
}
// narrow
-PortableServer::ForwardRequest_ptr
+PortableServer::ForwardRequest *
PortableServer::ForwardRequest::_narrow (CORBA::Exception *exc)
{
if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/ForwardRequest:1.0", exc->_id ())) // same type
- return ACE_dynamic_cast (PortableServer::ForwardRequest_ptr, exc);
+ return ACE_dynamic_cast (PortableServer::ForwardRequest *, exc);
else
return 0;
}
@@ -1586,11 +1586,11 @@ void PortableServer::POAManager::AdapterInactive::_tao_decode (TAO_InputCDR &cdr
}
// narrow
-PortableServer::POAManager::AdapterInactive_ptr
+PortableServer::POAManager::AdapterInactive *
PortableServer::POAManager::AdapterInactive::_narrow (CORBA::Exception *exc)
{
if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POAManager/AdapterInactive:1.0", exc->_id ())) // same type
- return ACE_dynamic_cast (PortableServer::POAManager::AdapterInactive_ptr, exc);
+ return ACE_dynamic_cast (PortableServer::POAManager::AdapterInactive *, exc);
else
return 0;
}
@@ -2121,11 +2121,11 @@ void PortableServer::POA::AdapterInactive::_tao_decode (TAO_InputCDR &cdr,
}
// narrow
-PortableServer::POA::AdapterInactive_ptr
+PortableServer::POA::AdapterInactive *
PortableServer::POA::AdapterInactive::_narrow (CORBA::Exception *exc)
{
if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/AdapterInactive:1.0", exc->_id ())) // same type
- return ACE_dynamic_cast (PortableServer::POA::AdapterInactive_ptr, exc);
+ return ACE_dynamic_cast (PortableServer::POA::AdapterInactive *, exc);
else
return 0;
}
@@ -2204,11 +2204,11 @@ void PortableServer::POA::AdapterNonExistent::_tao_decode (TAO_InputCDR &cdr,
}
// narrow
-PortableServer::POA::AdapterNonExistent_ptr
+PortableServer::POA::AdapterNonExistent *
PortableServer::POA::AdapterNonExistent::_narrow (CORBA::Exception *exc)
{
if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/AdapterNonExistent:1.0", exc->_id ())) // same type
- return ACE_dynamic_cast (PortableServer::POA::AdapterNonExistent_ptr, exc);
+ return ACE_dynamic_cast (PortableServer::POA::AdapterNonExistent *, exc);
else
return 0;
}
@@ -2294,11 +2294,11 @@ void PortableServer::POA::InvalidPolicy::_tao_decode (TAO_InputCDR &cdr,
}
// narrow
-PortableServer::POA::InvalidPolicy_ptr
+PortableServer::POA::InvalidPolicy *
PortableServer::POA::InvalidPolicy::_narrow (CORBA::Exception *exc)
{
if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/InvalidPolicy:1.0", exc->_id ())) // same type
- return ACE_dynamic_cast (PortableServer::POA::InvalidPolicy_ptr, exc);
+ return ACE_dynamic_cast (PortableServer::POA::InvalidPolicy *, exc);
else
return 0;
}
@@ -2380,11 +2380,11 @@ void PortableServer::POA::NoServant::_tao_decode (TAO_InputCDR &cdr,
}
// narrow
-PortableServer::POA::NoServant_ptr
+PortableServer::POA::NoServant *
PortableServer::POA::NoServant::_narrow (CORBA::Exception *exc)
{
if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/NoServant:1.0", exc->_id ())) // same type
- return ACE_dynamic_cast (PortableServer::POA::NoServant_ptr, exc);
+ return ACE_dynamic_cast (PortableServer::POA::NoServant *, exc);
else
return 0;
}
@@ -2465,11 +2465,11 @@ void PortableServer::POA::ObjectAlreadyActive::_tao_decode (TAO_InputCDR &cdr,
}
// narrow
-PortableServer::POA::ObjectAlreadyActive_ptr
+PortableServer::POA::ObjectAlreadyActive *
PortableServer::POA::ObjectAlreadyActive::_narrow (CORBA::Exception *exc)
{
if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/ObjectAlreadyActive:1.0", exc->_id ())) // same type
- return ACE_dynamic_cast (PortableServer::POA::ObjectAlreadyActive_ptr, exc);
+ return ACE_dynamic_cast (PortableServer::POA::ObjectAlreadyActive *, exc);
else
return 0;
}
@@ -2546,11 +2546,11 @@ void PortableServer::POA::ObjectNotActive::_tao_decode (TAO_InputCDR &cdr,
}
// narrow
-PortableServer::POA::ObjectNotActive_ptr
+PortableServer::POA::ObjectNotActive *
PortableServer::POA::ObjectNotActive::_narrow (CORBA::Exception *exc)
{
if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/ObjectNotActive:1.0", exc->_id ())) // same type
- return ACE_dynamic_cast (PortableServer::POA::ObjectNotActive_ptr, exc);
+ return ACE_dynamic_cast (PortableServer::POA::ObjectNotActive *, exc);
else
return 0;
}
@@ -2627,11 +2627,11 @@ void PortableServer::POA::ServantAlreadyActive::_tao_decode (TAO_InputCDR &cdr,
}
// narrow
-PortableServer::POA::ServantAlreadyActive_ptr
+PortableServer::POA::ServantAlreadyActive *
PortableServer::POA::ServantAlreadyActive::_narrow (CORBA::Exception *exc)
{
if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/ServantAlreadyActive:1.0", exc->_id ())) // same type
- return ACE_dynamic_cast (PortableServer::POA::ServantAlreadyActive_ptr, exc);
+ return ACE_dynamic_cast (PortableServer::POA::ServantAlreadyActive *, exc);
else
return 0;
}
@@ -2708,11 +2708,11 @@ void PortableServer::POA::ServantNotActive::_tao_decode (TAO_InputCDR &cdr,
}
// narrow
-PortableServer::POA::ServantNotActive_ptr
+PortableServer::POA::ServantNotActive *
PortableServer::POA::ServantNotActive::_narrow (CORBA::Exception *exc)
{
if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/ServantNotActive:1.0", exc->_id ())) // same type
- return ACE_dynamic_cast (PortableServer::POA::ServantNotActive_ptr, exc);
+ return ACE_dynamic_cast (PortableServer::POA::ServantNotActive *, exc);
else
return 0;
}
@@ -2789,11 +2789,11 @@ void PortableServer::POA::WrongAdapter::_tao_decode (TAO_InputCDR &cdr,
}
// narrow
-PortableServer::POA::WrongAdapter_ptr
+PortableServer::POA::WrongAdapter *
PortableServer::POA::WrongAdapter::_narrow (CORBA::Exception *exc)
{
if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/WrongAdapter:1.0", exc->_id ())) // same type
- return ACE_dynamic_cast (PortableServer::POA::WrongAdapter_ptr, exc);
+ return ACE_dynamic_cast (PortableServer::POA::WrongAdapter *, exc);
else
return 0;
}
@@ -2870,11 +2870,11 @@ void PortableServer::POA::WrongPolicy::_tao_decode (TAO_InputCDR &cdr,
}
// narrow
-PortableServer::POA::WrongPolicy_ptr
+PortableServer::POA::WrongPolicy *
PortableServer::POA::WrongPolicy::_narrow (CORBA::Exception *exc)
{
if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/POA/WrongPolicy:1.0", exc->_id ())) // same type
- return ACE_dynamic_cast (PortableServer::POA::WrongPolicy_ptr, exc);
+ return ACE_dynamic_cast (PortableServer::POA::WrongPolicy *, exc);
else
return 0;
}
@@ -3024,11 +3024,11 @@ void PortableServer::Current::NoContext::_tao_decode (TAO_InputCDR &cdr,
}
// narrow
-PortableServer::Current::NoContext_ptr
+PortableServer::Current::NoContext *
PortableServer::Current::NoContext::_narrow (CORBA::Exception *exc)
{
if (!ACE_OS::strcmp ("IDL:omg.org/PortableServer/Current/NoContext:1.0", exc->_id ())) // same type
- return ACE_dynamic_cast (PortableServer::Current::NoContext_ptr, exc);
+ return ACE_dynamic_cast (PortableServer::Current::NoContext *, exc);
else
return 0;
}
diff --git a/TAO/tao/POAC.h b/TAO/tao/POAC.h
index 714cb183b18..9832553a052 100644
--- a/TAO/tao/POAC.h
+++ b/TAO/tao/POAC.h
@@ -131,7 +131,6 @@ TAO_NAMESPACE PortableServer{
// *************************************************************
typedef TAO_Unbounded_Sequence<CORBA::Octet > _tao_seq_Octet;
- typedef _tao_seq_Octet* _tao_seq_Octet_ptr;
TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc__tao_seq_Octet;
#endif /* end #if !defined */
@@ -205,15 +204,6 @@ TAO_NAMESPACE PortableServer{
#if !defined (TAO_HAS_MINIMUM_CORBA)
-#if !defined (_PORTABLESERVER_FORWARDREQUEST___PTR_CH_)
-#define _PORTABLESERVER_FORWARDREQUEST___PTR_CH_
-
- class ForwardRequest;
- typedef ForwardRequest *ForwardRequest_ptr;
-
-#endif /* end #if !defined */
-
-
#if !defined (_PORTABLESERVER_FORWARDREQUEST_CH_)
#define _PORTABLESERVER_FORWARDREQUEST_CH_
@@ -244,11 +234,6 @@ TAO_NAMESPACE PortableServer{
// = TAO extension
static CORBA::Exception *_alloc (void);
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
- typedef ForwardRequest_ptr _ptr_type;
-#endif /* __GNUC__ */
- // Useful for template programming.
-
}; // exception PortableServer::ForwardRequest
TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_ForwardRequest;
@@ -1147,14 +1132,6 @@ TAO_NAMESPACE PortableServer{
static void _tao_any_destructor (void*);
-#if !defined (_PORTABLESERVER_POAMANAGER_ADAPTERINACTIVE___PTR_CH_)
-#define _PORTABLESERVER_POAMANAGER_ADAPTERINACTIVE___PTR_CH_
-
- class AdapterInactive;
- typedef AdapterInactive *AdapterInactive_ptr;
-
-#endif /* end #if !defined */
-
#if !defined (_PORTABLESERVER_POAMANAGER_ADAPTERINACTIVE_CH_)
#define _PORTABLESERVER_POAMANAGER_ADAPTERINACTIVE_CH_
@@ -1735,14 +1712,6 @@ TAO_NAMESPACE PortableServer{
#if (TAO_HAS_MINIMUM_POA == 0)
-#if !defined (_PORTABLESERVER_POA_ADAPTERINACTIVE___PTR_CH_)
-#define _PORTABLESERVER_POA_ADAPTERINACTIVE___PTR_CH_
-
- class AdapterInactive;
- typedef AdapterInactive *AdapterInactive_ptr;
-
-#endif /* end #if !defined */
-
#if !defined (_PORTABLESERVER_POA_ADAPTERINACTIVE_CH_)
#define _PORTABLESERVER_POA_ADAPTERINACTIVE_CH_
@@ -1766,10 +1735,6 @@ TAO_NAMESPACE PortableServer{
// = TAO extension
static CORBA::Exception *_alloc (void);
- #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
- typedef AdapterInactive_ptr _ptr_type;
- #endif /* __GNUC__ */
-
}; // exception PortableServer::POA::AdapterInactive
friend void operator<<= (CORBA::Any &, const AdapterInactive &); // copying version
@@ -1781,14 +1746,6 @@ TAO_NAMESPACE PortableServer{
#endif /* TAO_HAS_MINIMUM_POA == 0 */
-#if !defined (_PORTABLESERVER_POA_ADAPTERNONEXISTENT___PTR_CH_)
-#define _PORTABLESERVER_POA_ADAPTERNONEXISTENT___PTR_CH_
-
- class AdapterNonExistent;
- typedef AdapterNonExistent *AdapterNonExistent_ptr;
-
-#endif /* end #if !defined */
-
#if !defined (_PORTABLESERVER_POA_ADAPTERNONEXISTENT_CH_)
#define _PORTABLESERVER_POA_ADAPTERNONEXISTENT_CH_
@@ -1812,10 +1769,6 @@ TAO_NAMESPACE PortableServer{
// = TAO extension
static CORBA::Exception *_alloc (void);
- #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
- typedef AdapterNonExistent_ptr _ptr_type;
- #endif /* __GNUC__ */
-
}; // exception PortableServer::POA::AdapterNonExistent
friend void operator<<= (CORBA::Any &, const AdapterNonExistent &); // copying version
@@ -1825,14 +1778,6 @@ TAO_NAMESPACE PortableServer{
#endif /* end #if !defined */
-#if !defined (_PORTABLESERVER_POA_INVALIDPOLICY___PTR_CH_)
-#define _PORTABLESERVER_POA_INVALIDPOLICY___PTR_CH_
-
- class InvalidPolicy;
- typedef InvalidPolicy *InvalidPolicy_ptr;
-
-#endif /* end #if !defined */
-
#if !defined (_PORTABLESERVER_POA_INVALIDPOLICY_CH_)
#define _PORTABLESERVER_POA_INVALIDPOLICY_CH_
@@ -1862,10 +1807,6 @@ TAO_NAMESPACE PortableServer{
// = TAO extension
static CORBA::Exception *_alloc (void);
- #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
- typedef InvalidPolicy_ptr _ptr_type;
- #endif /* __GNUC__ */
-
}; // exception PortableServer::POA::InvalidPolicy
friend void operator<<= (CORBA::Any &, const InvalidPolicy &); // copying version
@@ -1877,14 +1818,6 @@ TAO_NAMESPACE PortableServer{
#if (TAO_HAS_MINIMUM_POA == 0)
-#if !defined (_PORTABLESERVER_POA_NOSERVANT___PTR_CH_)
-#define _PORTABLESERVER_POA_NOSERVANT___PTR_CH_
-
- class NoServant;
- typedef NoServant *NoServant_ptr;
-
-#endif /* end #if !defined */
-
#if !defined (_PORTABLESERVER_POA_NOSERVANT_CH_)
#define _PORTABLESERVER_POA_NOSERVANT_CH_
@@ -1908,10 +1841,6 @@ TAO_NAMESPACE PortableServer{
// = TAO extension
static CORBA::Exception *_alloc (void);
- #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
- typedef NoServant_ptr _ptr_type;
- #endif /* __GNUC__ */
-
}; // exception PortableServer::POA::NoServant
friend void operator<<= (CORBA::Any &, const NoServant &); // copying version
@@ -1923,14 +1852,6 @@ TAO_NAMESPACE PortableServer{
#endif /* TAO_HAS_MINIMUM_POA == 0 */
-#if !defined (_PORTABLESERVER_POA_OBJECTALREADYACTIVE___PTR_CH_)
-#define _PORTABLESERVER_POA_OBJECTALREADYACTIVE___PTR_CH_
-
- class ObjectAlreadyActive;
- typedef ObjectAlreadyActive *ObjectAlreadyActive_ptr;
-
-#endif /* end #if !defined */
-
#if !defined (_PORTABLESERVER_POA_OBJECTALREADYACTIVE_CH_)
#define _PORTABLESERVER_POA_OBJECTALREADYACTIVE_CH_
@@ -1954,10 +1875,6 @@ TAO_NAMESPACE PortableServer{
// = TAO extension
static CORBA::Exception *_alloc (void);
- #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
- typedef ObjectAlreadyActive_ptr _ptr_type;
- #endif /* __GNUC__ */
-
}; // exception PortableServer::POA::ObjectAlreadyActive
friend void operator<<= (CORBA::Any &, const ObjectAlreadyActive &); // copying version
@@ -1967,14 +1884,6 @@ TAO_NAMESPACE PortableServer{
#endif /* end #if !defined */
-#if !defined (_PORTABLESERVER_POA_OBJECTNOTACTIVE___PTR_CH_)
-#define _PORTABLESERVER_POA_OBJECTNOTACTIVE___PTR_CH_
-
- class ObjectNotActive;
- typedef ObjectNotActive *ObjectNotActive_ptr;
-
-#endif /* end #if !defined */
-
#if !defined (_PORTABLESERVER_POA_OBJECTNOTACTIVE_CH_)
#define _PORTABLESERVER_POA_OBJECTNOTACTIVE_CH_
@@ -1998,10 +1907,6 @@ TAO_NAMESPACE PortableServer{
// = TAO extension
static CORBA::Exception *_alloc (void);
- #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
- typedef ObjectNotActive_ptr _ptr_type;
- #endif /* __GNUC__ */
-
}; // exception PortableServer::POA::ObjectNotActive
friend void operator<<= (CORBA::Any &, const ObjectNotActive &); // copying version
@@ -2011,14 +1916,6 @@ TAO_NAMESPACE PortableServer{
#endif /* end #if !defined */
-#if !defined (_PORTABLESERVER_POA_SERVANTALREADYACTIVE___PTR_CH_)
-#define _PORTABLESERVER_POA_SERVANTALREADYACTIVE___PTR_CH_
-
- class ServantAlreadyActive;
- typedef ServantAlreadyActive *ServantAlreadyActive_ptr;
-
-#endif /* end #if !defined */
-
#if !defined (_PORTABLESERVER_POA_SERVANTALREADYACTIVE_CH_)
#define _PORTABLESERVER_POA_SERVANTALREADYACTIVE_CH_
@@ -2042,10 +1939,6 @@ TAO_NAMESPACE PortableServer{
// = TAO extension
static CORBA::Exception *_alloc (void);
- #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
- typedef ServantAlreadyActive_ptr _ptr_type;
- #endif /* __GNUC__ */
-
}; // exception PortableServer::POA::ServantAlreadyActive
friend void operator<<= (CORBA::Any &, const ServantAlreadyActive &); // copying version
@@ -2055,14 +1948,6 @@ TAO_NAMESPACE PortableServer{
#endif /* end #if !defined */
-#if !defined (_PORTABLESERVER_POA_SERVANTNOTACTIVE___PTR_CH_)
-#define _PORTABLESERVER_POA_SERVANTNOTACTIVE___PTR_CH_
-
- class ServantNotActive;
- typedef ServantNotActive *ServantNotActive_ptr;
-
-#endif /* end #if !defined */
-
#if !defined (_PORTABLESERVER_POA_SERVANTNOTACTIVE_CH_)
#define _PORTABLESERVER_POA_SERVANTNOTACTIVE_CH_
@@ -2086,10 +1971,6 @@ TAO_NAMESPACE PortableServer{
// = TAO extension
static CORBA::Exception *_alloc (void);
- #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
- typedef ServantNotActive_ptr _ptr_type;
- #endif /* __GNUC__ */
-
}; // exception PortableServer::POA::ServantNotActive
friend void operator<<= (CORBA::Any &, const ServantNotActive &); // copying version
@@ -2099,14 +1980,6 @@ TAO_NAMESPACE PortableServer{
#endif /* end #if !defined */
-#if !defined (_PORTABLESERVER_POA_WRONGADAPTER___PTR_CH_)
-#define _PORTABLESERVER_POA_WRONGADAPTER___PTR_CH_
-
- class WrongAdapter;
- typedef WrongAdapter *WrongAdapter_ptr;
-
-#endif /* end #if !defined */
-
#if !defined (_PORTABLESERVER_POA_WRONGADAPTER_CH_)
#define _PORTABLESERVER_POA_WRONGADAPTER_CH_
@@ -2130,10 +2003,6 @@ TAO_NAMESPACE PortableServer{
// = TAO extension
static CORBA::Exception *_alloc (void);
- #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
- typedef WrongAdapter_ptr _ptr_type;
- #endif /* __GNUC__ */
-
}; // exception PortableServer::POA::WrongAdapter
friend void operator<<= (CORBA::Any &, const WrongAdapter &); // copying version
@@ -2143,14 +2012,6 @@ TAO_NAMESPACE PortableServer{
#endif /* end #if !defined */
-#if !defined (_PORTABLESERVER_POA_WRONGPOLICY___PTR_CH_)
-#define _PORTABLESERVER_POA_WRONGPOLICY___PTR_CH_
-
- class WrongPolicy;
- typedef WrongPolicy *WrongPolicy_ptr;
-
-#endif /* end #if !defined */
-
#if !defined (_PORTABLESERVER_POA_WRONGPOLICY_CH_)
#define _PORTABLESERVER_POA_WRONGPOLICY_CH_
@@ -2174,10 +2035,6 @@ TAO_NAMESPACE PortableServer{
// = TAO extension
static CORBA::Exception *_alloc (void);
- #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
- typedef WrongPolicy_ptr _ptr_type;
- #endif /* __GNUC__ */
-
}; // exception PortableServer::POA::WrongPolicy
friend void operator<<= (CORBA::Any &, const WrongPolicy &); // copying version
@@ -2330,16 +2187,8 @@ TAO_NAMESPACE PortableServer{
static Current_ptr _duplicate (Current_ptr obj);
static Current_ptr _narrow (CORBA::Object_ptr obj, CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
static Current_ptr _nil (void);
- static void _tao_any_destructor (void*);
-
-
-#if !defined (_PORTABLESERVER_CURRENT_NOCONTEXT___PTR_CH_)
-#define _PORTABLESERVER_CURRENT_NOCONTEXT___PTR_CH_
-
- class NoContext;
- typedef NoContext *NoContext_ptr;
-#endif /* end #if !defined */
+ static void _tao_any_destructor (void*);
#if !defined (_PORTABLESERVER_CURRENT_NOCONTEXT_CH_)
#define _PORTABLESERVER_CURRENT_NOCONTEXT_CH_
@@ -2364,10 +2213,6 @@ TAO_NAMESPACE PortableServer{
// = TAO extension
static CORBA::Exception *_alloc (void);
- #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
- typedef NoContext_ptr _ptr_type;
- #endif /* __GNUC__ */
-
}; // exception PortableServer::Current::NoContext
friend void operator<<= (CORBA::Any &, const NoContext &); // copying version
diff --git a/TAO/tao/PolicyC.h b/TAO/tao/PolicyC.h
index d168a380f35..1f58a9d43ef 100644
--- a/TAO/tao/PolicyC.h
+++ b/TAO/tao/PolicyC.h
@@ -217,7 +217,6 @@ class TAO_Export CORBA_PolicyList : public TAO_Unbounded_Object_Sequence<CORBA_
{
public:
#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
- typedef CORBA_PolicyList_ptr _ptr_type;
typedef CORBA_PolicyList_var _var_type;
#endif /* __GNUC__ */
@@ -234,7 +233,6 @@ public:
static void _tao_any_destructor (void*);
};
-typedef CORBA_PolicyList *CORBA_PolicyList_ptr;
// *************************************************************
// class CORBA::PolicyList_var
diff --git a/TAO/tao/Request.h b/TAO/tao/Request.h
index 5745cdd9d65..f0eb4dead0c 100644
--- a/TAO/tao/Request.h
+++ b/TAO/tao/Request.h
@@ -285,7 +285,6 @@ class CORBA_ORB_RequestSeq : public TAO_Unbounded_Pseudo_Sequence<CORBA_Request,
public:
// Helpful with template programming.
#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
- typedef CORBA_ORB_RequestSeq_ptr _ptr_type;
typedef CORBA_ORB_RequestSeq_var _var_type;
#endif /* __GNUC__ */
diff --git a/TAO/tao/Services.h b/TAO/tao/Services.h
index de6fc4f2fc2..e6807ceea89 100644
--- a/TAO/tao/Services.h
+++ b/TAO/tao/Services.h
@@ -68,7 +68,6 @@ struct TAO_Export CORBA_ServiceDetail
#endif /* TAO_NO_COPY_OCTET_SEQUENCE */
};
- typedef _tao_seq_Octet *_tao_seq_Octet_ptr;
static CORBA::TypeCode_ptr _tc__tao_seq_Octet;
#endif /* end #if !defined */
diff --git a/TAO/tao/TAO.dsp b/TAO/tao/TAO.dsp
index 0a1bd80f845..f90bafc3670 100644
--- a/TAO/tao/TAO.dsp
+++ b/TAO/tao/TAO.dsp
@@ -328,6 +328,25 @@ SOURCE=.\Asynch_Invocation.cpp
# End Source File
# Begin Source File
+SOURCE=.\BoundsC.cpp
+
+!IF "$(CFG)" == "TAO DLL - Win32 Release"
+
+!ELSEIF "$(CFG)" == "TAO DLL - Win32 Debug"
+
+!ELSEIF "$(CFG)" == "TAO DLL - Win32 Alpha Release"
+
+!ELSEIF "$(CFG)" == "TAO DLL - Win32 Alpha Debug"
+
+!ELSEIF "$(CFG)" == "TAO DLL - Win32 MFC Debug"
+
+!ELSEIF "$(CFG)" == "TAO DLL - Win32 MFC Release"
+
+!ENDIF
+
+# End Source File
+# Begin Source File
+
SOURCE=.\Buffering_Constraint_Policy.cpp
!IF "$(CFG)" == "TAO DLL - Win32 Release"
@@ -3675,6 +3694,10 @@ SOURCE=.\Asynch_Invocation.i
# End Source File
# Begin Source File
+SOURCE=.\BoundsC.i
+# End Source File
+# Begin Source File
+
SOURCE=.\Buffering_Constraint_Policy.i
# End Source File
# Begin Source File
diff --git a/TAO/tao/corbafwd.h b/TAO/tao/corbafwd.h
index bea3ea0665c..1023e7484b3 100644
--- a/TAO/tao/corbafwd.h
+++ b/TAO/tao/corbafwd.h
@@ -187,7 +187,6 @@ typedef class CORBA_Request *CORBA_Request_ptr;
class CORBA_ORB_RequestSeq;
class CORBA_ORB_RequestSeq_var;
class CORBA_ORB_RequestSeq_out;
-typedef class CORBA_ORB_RequestSeq *CORBA_ORB_RequestSeq_ptr;
class CORBA_NamedValue;
class CORBA_NamedValue_var;
@@ -218,7 +217,6 @@ typedef class CORBA_ConstructionPolicy *CORBA_ConstructionPolicy_ptr;
class CORBA_AnySeq;
class CORBA_AnySeq_var;
class CORBA_AnySeq_out;
-typedef class CORBA_AnySeq *CORBA_AnySeq_ptr;
// Forward declarations.
class CORBA_NameValuePairSeq;
@@ -316,7 +314,6 @@ typedef CORBA_Policy *CORBA_Policy_ptr;
class CORBA_PolicyList;
class CORBA_PolicyList_var;
class CORBA_PolicyList_out;
-typedef CORBA_PolicyList *CORBA_PolicyList_ptr;
class CORBA_DomainManager;
class CORBA_DomainManager_var;
@@ -737,7 +734,6 @@ TAO_NAMESPACE CORBA
typedef Environment *Environment_ptr;
typedef CORBA_Exception Exception;
- typedef Exception *Exception_ptr;
typedef CORBA_SystemException SystemException;
typedef CORBA_UserException UserException;
@@ -1418,7 +1414,6 @@ TAO_NAMESPACE CORBA
TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_WrongTransaction;
typedef CORBA_AnySeq AnySeq;
- typedef CORBA_AnySeq *AnySeq_ptr;
typedef CORBA_AnySeq_var AnySeq_var;
typedef CORBA_AnySeq_out AnySeq_out;
TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_AnySeq;
@@ -1820,7 +1815,6 @@ operator>> (TAO_InputCDR&, TAO_opaque&);
class TAO_ObjectKey;
class TAO_ObjectKey_var;
class TAO_ObjectKey_out;
-typedef TAO_ObjectKey *TAO_ObjectKey_ptr;
#if defined (__ACE_INLINE__)
# include "tao/corbafwd.i"
View Lorry Controller Status