ChangeLog tag: Sun Jul 17 16:39:01 2005 Phil Mesnier <mesnier_p@ociweb.com>

1 files changed, 4 insertions, 31 deletions

diff --git a/TAO/tao/Resource_Factory.h b/TAO/tao/Resource_Factory.h
index 52f29c06cb1..65ec7222957 100644
--- a/TAO/tao/Resource_Factory.h
+++ b/TAO/tao/Resource_Factory.h
@@ -34,6 +34,7 @@ class TAO_Connector_Registry;
 class TAO_Flushing_Strategy;
 class TAO_Connection_Purging_Strategy;
 class TAO_LF_Strategy;
+class TAO_Codeset_Manager;
 
 class ACE_Lock;
 
@@ -86,34 +87,6 @@ typedef ACE_Unbounded_Set_Iterator<TAO_Protocol_Item*>
 
 // ****************************************************************
 
-class TAO_Export TAO_Codeset_Descriptor
-{
-public:
-  TAO_Codeset_Descriptor ();
-  ~TAO_Codeset_Descriptor ();
-  struct Translator_Node
-  {
-    char *name_;
-    Translator_Node *next_;
-  };
-  void ncs (ACE_CDR::ULong ncs, int mb = 0);
-  ACE_CDR::ULong ncs (void) const;
-  int max_bytes (void) const;
-
-  int ncs_set (void) const;
-
-  void add_translator (const char *name);
-  const Translator_Node *translators (void) const;
-
-private:
-  ACE_CDR::ULong ncs_;
-  int max_bytes_;
-  int ncs_set_;
-  Translator_Node *trans_base_;
-};
-
-// ****************************************************************
-
 /**
  * @class TAO_Resource_Factory
  *
@@ -203,9 +176,6 @@ public:
    */
   virtual TAO_ProtocolFactorySet *get_protocol_factories (void);
 
-  // Returns either the char or wchar codeset descriptor object.
-  virtual const TAO_Codeset_Descriptor *get_codeset_descriptor(int for_wchar=0) const;
-
   /**
    * This method will loop through the protocol list and
    * using the protocol name field this method will
@@ -216,6 +186,9 @@ public:
    */
   virtual int init_protocol_factories (void);
 
+  /// Gets the codeset manager.
+  virtual TAO_Codeset_Manager* codeset_manager (void);
+
   /// This denotes the maximum number of connections that can be cached.
   virtual int cache_maximum (void) const;