ChangeLogTag:Wed Apr 26 20:11:09 2000 Carlos O'Ryan <coryan@uci.edu>

8 files changed, 25 insertions, 267 deletions

diff --git a/TAO/tao/GIOPC.cpp b/TAO/tao/GIOPC.cpp
index e99104e1975..8c3f9858f36 100644
--- a/TAO/tao/GIOPC.cpp
+++ b/TAO/tao/GIOPC.cpp
@@ -115,7 +115,6 @@ TAO_NAMESPACE_END
 
 // default constructor
 GIOP::TargetAddress::TargetAddress (void)
-  : TAO_Base_Union ()
 {
   ACE_OS::memset (&this->disc_, 0, sizeof (this->disc_));
   ACE_OS::memset (&this->u_, 0, sizeof (this->u_));
@@ -123,7 +122,6 @@ GIOP::TargetAddress::TargetAddress (void)
 
 // copy constructor
 GIOP::TargetAddress::TargetAddress (const GIOP::TargetAddress &u)
-  : TAO_Base_Union ()
 {
   this->disc_ = u.disc_;
   switch (this->disc_)
@@ -220,28 +218,6 @@ void GIOP::TargetAddress::_reset (CORBA::Short, CORBA::Boolean /*finalize*/)
   }
 }
 
-// the virtual overloaded access method
-void *GIOP::TargetAddress::_access (CORBA::Boolean alloc_flag)
-{
-  switch (this->disc_)
-  {
-    case 0:
-      if (alloc_flag)
-        ACE_NEW_RETURN (this->u_.object_key_, TAO_ObjectKey, 0);
-      return this->u_.object_key_;
-    case 1:
-      if (alloc_flag)
-        ACE_NEW_RETURN (this->u_.profile_, IOP::TaggedProfile, 0);
-      return this->u_.profile_;
-    case 2:
-      if (alloc_flag)
-        ACE_NEW_RETURN (this->u_.ior_, GIOP::IORAddressingInfo, 0);
-      return this->u_.ior_;
-    default:
-      return 0;
-  }
-}
-
 static const CORBA::Long _oc_GIOP_TargetAddress[] =
 {
   TAO_ENCAP_BYTE_ORDER, // byte order
diff --git a/TAO/tao/GIOPC.h b/TAO/tao/GIOPC.h
index b74f16f44f7..8003d004385 100644
--- a/TAO/tao/GIOPC.h
+++ b/TAO/tao/GIOPC.h
@@ -35,7 +35,6 @@
 
 #include "tao/corbafwd.h"
 #include "tao/IOPC.h"
-#include "tao/Union.h"
 #include "tao/Object_KeyC.h"
 
 #if defined (ACE_HAS_MINIMUM_IOSTREAMH_INCLUSION)
@@ -144,7 +143,7 @@ TAO_NAMESPACE  GIOP
   class TargetAddress;
   class TargetAddress_var;
   
-  class TAO_Export TargetAddress: public TAO_Base_Union 
+  class TAO_Export TargetAddress
   {
   public:
     TargetAddress (void); // default constructor
@@ -186,15 +185,9 @@ TAO_NAMESPACE  GIOP
   void _reset (CORBA::Short, CORBA::Boolean);
   // Frees any allocated storage
 
-  virtual void *_discriminant (void);
-  // returns pointer to the discriminant
-
-  virtual void _reset (void);
+  void _reset (void);
   // calls the above reset with finalize=1
 
-  virtual void *_access (CORBA::Boolean flag);
-  // accesses the right data member. Also will allocate on TRUE flag
-
 }; // GIOP::TargetAddress
 
 TAO_NAMESPACE_STORAGE_CLASS CORBA::TypeCode_ptr _tc_TargetAddress;
diff --git a/TAO/tao/GIOPC.i b/TAO/tao/GIOPC.i
index 715e79e5e1e..196d92af16e 100644
--- a/TAO/tao/GIOPC.i
+++ b/TAO/tao/GIOPC.i
@@ -67,20 +67,20 @@ GIOP::IORAddressingInfo_var::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 GIOP::IORAddressingInfo_var::operator const GIOP::IORAddressingInfo &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-GIOP::IORAddressingInfo_var::operator GIOP::IORAddressingInfo &() // cast 
+ACE_INLINE
+GIOP::IORAddressingInfo_var::operator GIOP::IORAddressingInfo &() // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-GIOP::IORAddressingInfo_var::operator GIOP::IORAddressingInfo &() const// cast 
+ACE_INLINE
+GIOP::IORAddressingInfo_var::operator GIOP::IORAddressingInfo &() const// cast
 {
   return *this->ptr_;
 }
@@ -97,7 +97,7 @@ GIOP::IORAddressingInfo_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE GIOP::IORAddressingInfo *&
 GIOP::IORAddressingInfo_var::out (void)
 {
@@ -158,7 +158,7 @@ GIOP::IORAddressingInfo_out::operator= (GIOP::IORAddressingInfo *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 GIOP::IORAddressingInfo_out::operator GIOP::IORAddressingInfo *&() // cast
 {
   return this->ptr_;
@@ -196,15 +196,8 @@ GIOP::TargetAddress::_reset (void)
   ACE_OS::memcpy (&this->u_, 0, sizeof (this->u_));
 }
 
-// returns pointer to the discriminant
-ACE_INLINE void *
-GIOP::TargetAddress::_discriminant (void)
-{
-  return &this->disc_;
-}
-
 // the implicit _default () method
-ACE_INLINE void 
+ACE_INLINE void
 GIOP::TargetAddress::_default ()
 {
   this->disc_ = -32768;
@@ -237,14 +230,14 @@ GIOP::TargetAddress::object_key (const TAO_ObjectKey &val)
     );
 }
 
-// readonly get method 
+// readonly get method
 ACE_INLINE const TAO_ObjectKey &
 GIOP::TargetAddress::object_key (void) const
 {
   return *this->u_.object_key_;
 }
 
-// read/write get method 
+// read/write get method
 ACE_INLINE TAO_ObjectKey &
 GIOP::TargetAddress::object_key (void)
 {
@@ -264,14 +257,14 @@ GIOP::TargetAddress::profile (const IOP::TaggedProfile &val)
     );
 }
 
-// readonly get method 
+// readonly get method
 ACE_INLINE const IOP::TaggedProfile &
 GIOP::TargetAddress::profile (void) const
 {
   return *this->u_.profile_;
 }
 
-// read/write get method 
+// read/write get method
 ACE_INLINE IOP::TaggedProfile &
 GIOP::TargetAddress::profile (void)
 {
@@ -291,14 +284,14 @@ GIOP::TargetAddress::ior (const GIOP::IORAddressingInfo &val)
     );
 }
 
-// readonly get method 
+// readonly get method
 ACE_INLINE const GIOP::IORAddressingInfo &
 GIOP::TargetAddress::ior (void) const
 {
   return *this->u_.ior_;
 }
 
-// read/write get method 
+// read/write get method
 ACE_INLINE GIOP::IORAddressingInfo &
 GIOP::TargetAddress::ior (void)
 {
@@ -369,20 +362,20 @@ GIOP::TargetAddress_var::operator-> (void)
   return this->ptr_;
 }
 
-ACE_INLINE 
+ACE_INLINE
 GIOP::TargetAddress_var::operator const GIOP::TargetAddress &() const // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-GIOP::TargetAddress_var::operator GIOP::TargetAddress &() // cast 
+ACE_INLINE
+GIOP::TargetAddress_var::operator GIOP::TargetAddress &() // cast
 {
   return *this->ptr_;
 }
 
-ACE_INLINE 
-GIOP::TargetAddress_var::operator GIOP::TargetAddress &() const// cast 
+ACE_INLINE
+GIOP::TargetAddress_var::operator GIOP::TargetAddress &() const// cast
 {
   return *this->ptr_;
 }
@@ -399,7 +392,7 @@ GIOP::TargetAddress_var::inout (void)
   return *this->ptr_;
 }
 
-// mapping for variable size 
+// mapping for variable size
 ACE_INLINE GIOP::TargetAddress *&
 GIOP::TargetAddress_var::out (void)
 {
@@ -467,7 +460,7 @@ GIOP::TargetAddress_out::operator= (GIOP::TargetAddress *p)
   return *this;
 }
 
-ACE_INLINE 
+ACE_INLINE
 GIOP::TargetAddress_out::operator GIOP::TargetAddress *&() // cast
 {
   return this->ptr_;
@@ -498,7 +491,7 @@ ACE_INLINE CORBA::Boolean operator<< (TAO_OutputCDR &strm, const GIOP::IORAddres
     return 1;
   else
     return 0;
-  
+
 }
 
 ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, GIOP::IORAddressingInfo &_tao_aggregate)
@@ -510,7 +503,7 @@ ACE_INLINE CORBA::Boolean operator>> (TAO_InputCDR &strm, GIOP::IORAddressingInf
     return 1;
   else
     return 0;
-  
+
 }
 
 
@@ -590,4 +583,3 @@ ACE_INLINE CORBA::Boolean operator>> (
   }
   return result;
 }
-
diff --git a/TAO/tao/Makefile b/TAO/tao/Makefile
index 9b759d7d16d..710c692b29e 100644
--- a/TAO/tao/Makefile
+++ b/TAO/tao/Makefile
@@ -123,7 +123,6 @@ INTERPRETIVE_MARSHALING_FILES = \
 
 IDL_COMPILER_FILES = \
   Managed_Types \
-  Union \
   Operation_Table
 
 ORB_CORE_FILES = \
@@ -689,7 +688,6 @@ realclean:
  Invocation.i \
  InconsistentTypeCodeC.h \
  DynAny_i.h \
- Union.h \
  ObjectIDList.h \
  ObjectIDList.i \
  WrongTransactionC.h \
@@ -1142,7 +1140,6 @@ realclean:
  Invocation.i \
  InconsistentTypeCodeC.h \
  DynAny_i.h \
- Union.h \
  ObjectIDList.h \
  ObjectIDList.i \
  WrongTransactionC.h \
@@ -1443,7 +1440,6 @@ realclean:
  Invocation.i \
  InconsistentTypeCodeC.h \
  DynAny_i.h \
- Union.h \
  ObjectIDList.h \
  ObjectIDList.i \
  WrongTransactionC.h \
@@ -1938,7 +1934,6 @@ realclean:
  Invocation.i \
  InconsistentTypeCodeC.h \
  DynAny_i.h \
- Union.h \
  ObjectIDList.h \
  ObjectIDList.i \
  WrongTransactionC.h \
@@ -2393,7 +2388,6 @@ realclean:
  Invocation.i \
  InconsistentTypeCodeC.h \
  DynAny_i.h \
- Union.h \
  ObjectIDList.h \
  ObjectIDList.i \
  WrongTransactionC.h \
@@ -2844,7 +2838,6 @@ realclean:
  Invocation.i \
  InconsistentTypeCodeC.h \
  DynAny_i.h \
- Union.h \
  ObjectIDList.h \
  ObjectIDList.i \
  WrongTransactionC.h \
@@ -3138,7 +3131,6 @@ realclean:
  Invocation.i \
  InconsistentTypeCodeC.h \
  DynAny_i.h \
- Union.h \
  ObjectIDList.h \
  ObjectIDList.i \
  WrongTransactionC.h \
@@ -4948,7 +4940,6 @@ realclean:
  Invocation.i \
  InconsistentTypeCodeC.h \
  DynAny_i.h \
- Union.h \
  ObjectIDList.h \
  ObjectIDList.i \
  WrongTransactionC.h \
@@ -6062,7 +6053,6 @@ realclean:
  GIOP_Message_Accept_State.h \
  GIOP_Message_Headers.h \
  GIOPC.h \
- Union.h \
  Object_KeyC.h \
  Object_KeyC.i \
  GIOPC.i \
@@ -6980,7 +6970,6 @@ realclean:
  Invocation.i \
  InconsistentTypeCodeC.h \
  DynAny_i.h \
- Union.h \
  ObjectIDList.h \
  ObjectIDList.i \
  WrongTransactionC.h \
@@ -8111,7 +8100,6 @@ realclean:
  GIOP_Message_Accept_State.h \
  GIOP_Message_Headers.h \
  GIOPC.h \
- Union.h \
  Object_KeyC.h \
  Object_KeyC.i \
  GIOPC.i \
@@ -8749,7 +8737,6 @@ realclean:
  Invocation.i \
  InconsistentTypeCodeC.h \
  DynAny_i.h \
- Union.h \
  ObjectIDList.h \
  ObjectIDList.i \
  WrongTransactionC.h \
@@ -9871,7 +9858,6 @@ realclean:
  GIOP_Message_Accept_State.h \
  GIOP_Message_Headers.h \
  GIOPC.h \
- Union.h \
  Object_KeyC.h \
  Object_KeyC.i \
  GIOPC.i \
@@ -11998,87 +11984,6 @@ realclean:
  Interceptor.i \
  ORB.i
 
-.obj/Union.o .obj/Union.so .shobj/Union.o .shobj/Union.so: Union.cpp \
- Union.h \
- $(ACE_ROOT)/ace/pre.h \
- corbafwd.h \
- $(ACE_ROOT)/ace/CDR_Stream.h \
- $(ACE_ROOT)/ace/Message_Block.h \
- $(ACE_ROOT)/ace/ACE.h \
- $(ACE_ROOT)/ace/OS.h \
- $(ACE_ROOT)/ace/post.h \
- $(ACE_ROOT)/ace/ace_wchar.h \
- $(ACE_ROOT)/ace/ACE_export.h \
- $(ACE_ROOT)/ace/svc_export.h \
- $(ACE_ROOT)/ace/Min_Max.h \
- $(ACE_ROOT)/ace/streams.h \
- $(ACE_ROOT)/ace/Basic_Types.h \
- $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/Trace.h \
- $(ACE_ROOT)/ace/OS.i \
- $(ACE_ROOT)/ace/Log_Msg.h \
- $(ACE_ROOT)/ace/Log_Record.h \
- $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/Log_Record.i \
- $(ACE_ROOT)/ace/ACE.i \
- $(ACE_ROOT)/ace/Malloc.h \
- $(ACE_ROOT)/ace/Malloc_Base.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.h \
- $(ACE_ROOT)/ace/Based_Pointer_T.i \
- $(ACE_ROOT)/ace/Based_Pointer_T.cpp \
- $(ACE_ROOT)/ace/Based_Pointer_Repository.h \
- $(ACE_ROOT)/ace/Singleton.h \
- $(ACE_ROOT)/ace/Synch.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
- $(ACE_ROOT)/ace/SV_Semaphore_Simple.i \
- $(ACE_ROOT)/ace/SV_Semaphore_Complex.i \
- $(ACE_ROOT)/ace/Synch.i \
- $(ACE_ROOT)/ace/Synch_T.h \
- $(ACE_ROOT)/ace/Event_Handler.h \
- $(ACE_ROOT)/ace/Event_Handler.i \
- $(ACE_ROOT)/ace/Synch_T.i \
- $(ACE_ROOT)/ace/Thread.h \
- $(ACE_ROOT)/ace/Thread.i \
- $(ACE_ROOT)/ace/Atomic_Op.i \
- $(ACE_ROOT)/ace/Synch_T.cpp \
- $(ACE_ROOT)/ace/Singleton.i \
- $(ACE_ROOT)/ace/Singleton.cpp \
- $(ACE_ROOT)/ace/Object_Manager.h \
- $(ACE_ROOT)/ace/Object_Manager.i \
- $(ACE_ROOT)/ace/Managed_Object.h \
- $(ACE_ROOT)/ace/Managed_Object.i \
- $(ACE_ROOT)/ace/Managed_Object.cpp \
- $(ACE_ROOT)/ace/Malloc.i \
- $(ACE_ROOT)/ace/Malloc_T.h \
- $(ACE_ROOT)/ace/Free_List.h \
- $(ACE_ROOT)/ace/Free_List.i \
- $(ACE_ROOT)/ace/Free_List.cpp \
- $(ACE_ROOT)/ace/Malloc_T.i \
- $(ACE_ROOT)/ace/Malloc_T.cpp \
- $(ACE_ROOT)/ace/Memory_Pool.h \
- $(ACE_ROOT)/ace/Signal.h \
- $(ACE_ROOT)/ace/Containers.h \
- $(ACE_ROOT)/ace/Containers.i \
- $(ACE_ROOT)/ace/Containers_T.h \
- $(ACE_ROOT)/ace/Containers_T.i \
- $(ACE_ROOT)/ace/Containers_T.cpp \
- $(ACE_ROOT)/ace/Signal.i \
- $(ACE_ROOT)/ace/Mem_Map.h \
- $(ACE_ROOT)/ace/Mem_Map.i \
- $(ACE_ROOT)/ace/Memory_Pool.i \
- $(ACE_ROOT)/ace/Message_Block.i \
- $(ACE_ROOT)/ace/Message_Block_T.h \
- $(ACE_ROOT)/ace/Message_Block_T.i \
- $(ACE_ROOT)/ace/Message_Block_T.cpp \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/CDR_Stream.i \
- try_macros.h \
- orbconf.h \
- $(ACE_ROOT)/ace/CORBA_macros.h \
- corbafwd.i
-
 .obj/Operation_Table.o .obj/Operation_Table.so .shobj/Operation_Table.o .shobj/Operation_Table.so: Operation_Table.cpp \
  Operation_Table.h \
  $(ACE_ROOT)/ace/pre.h \
@@ -14157,7 +14062,6 @@ realclean:
  target_specification.i \
  Invocation.i \
  InconsistentTypeCodeC.h \
- Union.h \
  ObjectIDList.h \
  ObjectIDList.i \
  WrongTransactionC.h \
@@ -18365,7 +18269,6 @@ realclean:
  Invocation.i \
  InconsistentTypeCodeC.h \
  DynAny_i.h \
- Union.h \
  ObjectIDList.h \
  ObjectIDList.i \
  WrongTransactionC.h \
@@ -21932,7 +21835,6 @@ realclean:
  varout.i \
  varout.cpp \
  IOPC.i \
- Union.h \
  Object_KeyC.h \
  Object_KeyC.i \
  GIOPC.i \
@@ -26930,7 +26832,6 @@ realclean:
  Object_KeyC.i \
  target_specification.i \
  GIOPC.h \
- Union.h \
  GIOPC.i
 
 .obj/GIOP_Message_Acceptors.o .obj/GIOP_Message_Acceptors.so .shobj/GIOP_Message_Acceptors.o .shobj/GIOP_Message_Acceptors.so: GIOP_Message_Acceptors.cpp \
@@ -27044,7 +26945,6 @@ realclean:
  GIOP_Message_Accept_State.h \
  GIOP_Message_Headers.h \
  GIOPC.h \
- Union.h \
  Object_KeyC.h \
  Object_KeyC.i \
  GIOPC.i \
@@ -27342,7 +27242,6 @@ realclean:
  varout.i \
  varout.cpp \
  IOPC.i \
- Union.h \
  Object_KeyC.h \
  Object_KeyC.i \
  GIOPC.i \
@@ -27723,7 +27622,6 @@ realclean:
  varout.i \
  varout.cpp \
  IOPC.i \
- Union.h \
  Object_KeyC.h \
  Object_KeyC.i \
  GIOPC.i \
@@ -27998,7 +27896,6 @@ realclean:
  GIOP_Message_State.i \
  GIOP_Message_Base.i \
  GIOPC.h \
- Union.h \
  GIOPC.i \
  GIOP_Server_Request.i \
  NVList.h \
@@ -28340,7 +28237,6 @@ realclean:
  Invocation.i \
  InconsistentTypeCodeC.h \
  DynAny_i.h \
- Union.h \
  ObjectIDList.h \
  ObjectIDList.i \
  WrongTransactionC.h \
diff --git a/TAO/tao/Makefile.am b/TAO/tao/Makefile.am
index 5ad6549b831..645222eece2 100644
--- a/TAO/tao/Makefile.am
+++ b/TAO/tao/Makefile.am
@@ -59,13 +59,11 @@ INTERPRETIVE_MARSHALING_FILES = \
   decode.cpp \
   deep_free.cpp \
   encode.cpp \
-  CDR_Interpreter.cpp \
   Marshal.cpp \
   skip.cpp
 
 IDL_COMPILER_FILES = \
   Managed_Types.cpp \
-  Union.cpp \
   Operation_Table.cpp
 
 ORB_CORE_FILES = \
@@ -240,7 +238,6 @@ HEADER_FILES = \
   BoundsC.h \
   Buffering_Constraint_Policy.h \
   CDR.h \
-  CDR_Interpreter.h \
   CONV_FRAMEC.h \
   CONV_FRAMES.h \
   CONV_FRAMES_T.h \
@@ -353,7 +350,6 @@ HEADER_FILES = \
   UIOP_Factory.h \
   UIOP_Profile.h \
   UIOP_Transport.h \
-  Union.h \
   ValueBase.h \
   ValueFactory.h \
   ValueFactory_Map.h \
diff --git a/TAO/tao/Union.cpp b/TAO/tao/Union.cpp
deleted file mode 100644
index ff534013ad8..00000000000
--- a/TAO/tao/Union.cpp
+++ /dev/null
@@ -1,31 +0,0 @@
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    Union.cpp
-//
-// = AUTHOR
-//
-//    Aniruddha Gokhale (Idea by Carlos O'Ryan)
-//
-// ============================================================================
-
-#include "tao/Union.h"
-
-ACE_RCSID(tao, Union, "$Id$")
-
-// *************************************************************
-// Operations for class TAO_Base_Union
-// *************************************************************
-
-TAO_Base_Union::TAO_Base_Union (void)
-{
-}
-
-TAO_Base_Union::~TAO_Base_Union (void)
-{
-}
diff --git a/TAO/tao/Union.h b/TAO/tao/Union.h
deleted file mode 100644
index df5b0e9f895..00000000000
--- a/TAO/tao/Union.h
+++ /dev/null
@@ -1,63 +0,0 @@
-/* -*- C++ -*- */
-// $Id$
-
-// ============================================================================
-//
-// = LIBRARY
-//    TAO
-//
-// = FILENAME
-//    Union.h
-//
-// = AUTHOR
-//
-//    Aniruddha Gokhale (Idea by Carlos O'Ryan)
-//
-// ============================================================================
-
-#ifndef TAO_UNION_H
-#define TAO_UNION_H
-#include "ace/pre.h"
-
-#include "tao/corbafwd.h"
-
-#if !defined (ACE_LACKS_PRAGMA_ONCE)
-# pragma once
-#endif /* ACE_LACKS_PRAGMA_ONCE */
-
-class TAO_Export TAO_Base_Union
-{
-  // = TITLE
-  //   Base class for TAO Unions.
-  //
-  // = DESCRIPTION
-  //   This class provides a common interface for all IDL unions,
-  //   hence the interpreted marshal engine can manipulate them in a
-  //   type-safe manner.
-public:
-  friend class TAO_Marshal_Union;
-  // We give access to TAO_Marshal_Union, this allows a safe
-  // implementation of the marshal engine.
-
-  virtual ~TAO_Base_Union (void);
-  // destructor.
-
-  virtual void *_discriminant (void) = 0;
-  // Return pointer to the discriminant.
-
-  virtual void *_access (CORBA::Boolean flag) = 0;
-  // Provides access to the right data member at the right offset. If
-  // the flag is TRUE, we allocate the necessary storage. This will be
-  // required for the decoding side.
-
-  virtual void _reset (void) = 0;
-  // Free existing storage.
-
-protected:
-  TAO_Base_Union (void);
-  // Default constructor.
-
-};
-
-#include "ace/post.h"
-#endif /* TAO_BASE_UNION_H */
diff --git a/TAO/tao/corba.h b/TAO/tao/corba.h
index 6732cf333a9..f599437767a 100644
--- a/TAO/tao/corba.h
+++ b/TAO/tao/corba.h
@@ -81,7 +81,6 @@
 #include "tao/Managed_Types.h"
 #include "tao/Sequence.h"
 #include "tao/Object_KeyC.h"
-#include "tao/Union.h"
 #include "tao/ValueBase.h"
 #include "tao/ValueFactory.h"
 #include "tao/Services.h"