ChangeLogTag:Sat Mar 26 02:34:11 2005 Ossama Othman <ossama@dre.vanderbilt.edu>

3 files changed, 6 insertions, 54 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 7f0f5fd6778..d93c49be835 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -19,6 +19,12 @@ Sat Mar 26 02:34:11 2005  Ossama Othman  <ossama@dre.vanderbilt.edu>
 	  Updated CORBA SystemException TypeCode instantations to use new
 	  TypeCode implementation.
 
+	* tao/TAO_Singleton_Manager.cpp (fini):
+
+	  Removed function calls that finalized standard CORBA TypeCodes.
+	  Those TypeCodes are now automatically cleaned up during process
+	  termination.
+
 	* tao/DynamicInterface/Unknown_User_Exception.cpp:
 	* tao/DynamicInterface/Unknown_User_Exception.h:
 
diff --git a/TAO/tao/TAO_Singleton_Manager.cpp b/TAO/tao/TAO_Singleton_Manager.cpp
index 872dea0e5fc..fcacaa78283 100644
--- a/TAO/tao/TAO_Singleton_Manager.cpp
+++ b/TAO/tao/TAO_Singleton_Manager.cpp
@@ -2,7 +2,6 @@
 
 #include "tao/TAO_Singleton_Manager.h"
 #include "tao/Exception.h"
-#include "tao/Typecode_Constants.h"
 
 #include "ace/Guard_T.h"
 #include "ace/Recursive_Thread_Mutex.h"
@@ -275,12 +274,6 @@ TAO_Singleton_Manager::fini (void)
       delete this;
     }
 
-  // Clean up all ORB owned Exceptions (before TypeCode clean up).
-  TAO_Exceptions::fini ();
-
-  // Clean up all ORB owned TypeCodes.
-  TAO::TypeCode_Constants::fini ();
-
   return 0;
 }
 
diff --git a/TAO/tao/Typecode_Constants.h b/TAO/tao/Typecode_Constants.h
deleted file mode 100644
index 0a06832bdb4..00000000000
--- a/TAO/tao/Typecode_Constants.h
+++ /dev/null
@@ -1,47 +0,0 @@
-// This may look like C, but it's really -*- C++ -*-
-
-//=============================================================================
-/**
- *  @file    Typecode_Constants.h
- *
- *  $Id$
- *
- *  Header file for the class that creates and destroy's the ORB's typecodes.
- *
- *  @author  Jeff Parsons <j.parsons@vanderbilt.edu>
- */
-//=============================================================================
-
-#ifndef TAO_TYPECODE_CONSTANTS_H
-#define TAO_TYPECODE_CONSTANTS_H
-
-#include /**/ "ace/pre.h"
-
-namespace TAO
-{
-  /**
-   * @class TypeCode_Constants
-   *
-   * @brief This class is a namespace for TypeCode-related static data that
-   * is owned by the ORB.
-   */
-  class TypeCode_Constants
-  {
-  public:
-    /// Runtime initialization of all standard typecodes.
-    /// Called from <CORBA::ORB_init>.
-    static void init (void);
-
-    /// Runtime finalization of all standard typecodes.
-    static void fini (void);
-
-  private:
-    /// Flag that denotes that the TAO TypeCode constants have been
-    /// initialized.
-    static int initialized_;
-  };
-}
-
-#include /**/ "ace/post.h"
-
-#endif /* TAO_TYPECODE_CONSTANTS_H */