Removal of some _ptr_type typedefs.

2 files changed, 9 insertions, 36 deletions

diff --git a/TAO/tao/DynAnyC.cpp b/TAO/tao/DynAnyC.cpp
index 113a5c0f719..07ea897c72f 100644
--- a/TAO/tao/DynAnyC.cpp
+++ b/TAO/tao/DynAnyC.cpp
@@ -106,12 +106,12 @@ CORBA_DynAny::Invalid::operator= (const CORBA_DynAny::Invalid &_tao_excp)
 }
 
 // narrow
-CORBA_DynAny::Invalid_ptr
+CORBA_DynAny::Invalid *
 CORBA_DynAny::Invalid::_narrow (CORBA::Exception *exc)
 {
   if (!ACE_OS::strcmp ("IDL:/CORBA_DynAny/Invalid:1.0",
                        exc->_id ())) // same type
-    return ACE_dynamic_cast (CORBA_DynAny::Invalid_ptr,
+    return ACE_dynamic_cast (CORBA_DynAny::Invalid *,
                              exc);
   else
     return 0;
@@ -205,12 +205,12 @@ CORBA_DynAny::InvalidValue::operator= (
 }
 
 // narrow
-CORBA_DynAny::InvalidValue_ptr
+CORBA_DynAny::InvalidValue *
 CORBA_DynAny::InvalidValue::_narrow (CORBA::Exception *exc)
 {
   if (!ACE_OS::strcmp ("IDL:/CORBA_DynAny/InvalidValue:1.0",
                        exc->_id ())) // same type
-    return ACE_dynamic_cast (CORBA_DynAny::InvalidValue_ptr,
+    return ACE_dynamic_cast (CORBA_DynAny::InvalidValue *,
                              exc);
   else
     return 0;
@@ -308,12 +308,12 @@ CORBA_DynAny::TypeMismatch::operator= (
 }
 
 // narrow
-CORBA_DynAny::TypeMismatch_ptr
+CORBA_DynAny::TypeMismatch *
 CORBA_DynAny::TypeMismatch::_narrow (CORBA::Exception *exc)
 {
   if (!ACE_OS::strcmp ("IDL:/CORBA_DynAny/TypeMismatch:1.0",
                        exc->_id ())) // same type
-    return ACE_dynamic_cast (CORBA_DynAny::TypeMismatch_ptr,
+    return ACE_dynamic_cast (CORBA_DynAny::TypeMismatch *,
                              exc);
   else
     return 0;
@@ -410,12 +410,12 @@ CORBA_DynAny::InvalidSeq::operator= (
 }
 
 // narrow
-CORBA_DynAny::InvalidSeq_ptr
+CORBA_DynAny::InvalidSeq *
 CORBA_DynAny::InvalidSeq::_narrow (CORBA::Exception *exc)
 {
   if (!ACE_OS::strcmp ("IDL:/CORBA_DynAny/InvalidSeq:1.0",
                        exc->_id ())) // same type
-    return ACE_dynamic_cast (CORBA_DynAny::InvalidSeq_ptr,
+    return ACE_dynamic_cast (CORBA_DynAny::InvalidSeq *,
                              exc);
   else
     return 0;
diff --git a/TAO/tao/DynAnyC.h b/TAO/tao/DynAnyC.h
index 47346e899ce..923656cb380 100644
--- a/TAO/tao/DynAnyC.h
+++ b/TAO/tao/DynAnyC.h
@@ -114,7 +114,6 @@ public:
   static CORBA_DynAny_ptr _nil (void);
 
   class Invalid;
-  typedef Invalid *Invalid_ptr;
 
   class TAO_Export Invalid : public CORBA::UserException
   {
@@ -138,17 +137,11 @@ public:
     // = TAO extension
     static CORBA::Exception *_alloc (void);
 
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef Invalid_ptr _ptr_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
-
   }; // exception CORBA_DynAny::Invalid
 
     static CORBA::TypeCode_ptr _tc_Invalid;
 
   class InvalidValue;
-  typedef InvalidValue *InvalidValue_ptr;
 
   class TAO_Export InvalidValue : public CORBA::UserException
   {
@@ -172,17 +165,11 @@ public:
     // = TAO extension
     static CORBA::Exception *_alloc (void);
 
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef InvalidValue_ptr _ptr_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
-
   }; // exception CORBA_DynAny::InvalidValue
 
     static CORBA::TypeCode_ptr _tc_InvalidValue;
 
   class TypeMismatch;
-  typedef TypeMismatch *TypeMismatch_ptr;
 
   class TAO_Export TypeMismatch : public CORBA::UserException
   {
@@ -206,17 +193,11 @@ public:
     // = TAO extension
     static CORBA::Exception *_alloc (void);
 
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef TypeMismatch_ptr _ptr_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
-
-  }; // exception CORBA_DynAny::TypeMismatch
+ }; // exception CORBA_DynAny::TypeMismatch
 
     static CORBA::TypeCode_ptr _tc_TypeMismatch;
 
   class InvalidSeq;
-  typedef InvalidSeq *InvalidSeq_ptr;
 
   class TAO_Export InvalidSeq : public CORBA::UserException
   {
@@ -240,11 +221,6 @@ public:
     // = TAO extension
     static CORBA::Exception *_alloc (void);
 
-#if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef InvalidSeq_ptr _ptr_type;
-#endif /* __GNUC__ */
-  // Useful for template programming.
-
   }; // exception CORBA_DynAny::InvalidSeq
 
     static CORBA::TypeCode_ptr _tc_InvalidSeq;
@@ -610,7 +586,6 @@ struct TAO_Export CORBA_NameValuePair
   CORBA::Any value;
 
 #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA_NameValuePair_ptr _ptr_type;
   typedef CORBA_NameValuePair_var _var_type;
 #endif /* __GNUC__ */
   // Useful for template programming.
@@ -879,7 +854,6 @@ public:
   ~CORBA_NameValuePairSeq (void); // dtor
 
 #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA_NameValuePairSeq_ptr _ptr_type;
   typedef CORBA_NameValuePairSeq_var _var_type;
 #endif /* __GNUC__ */
   // Useful for template programming.
@@ -1364,7 +1338,6 @@ public:
   ~CORBA_AnySeq (void); // dtor
 
 #if !defined(__GNUC__) || __GNUC__ > 2 || __GNUC_MINOR__ >= 8
-  typedef CORBA_AnySeq_ptr _ptr_type;
   typedef CORBA_AnySeq_var _var_type;
 #endif /* __GNUC__ */