ChangeLog tag: Wed Jul 13 16:37:41 2005 Phil Mesnier <mesnier_p@ociweb.com>

1 files changed, 31 insertions, 2 deletions

diff --git a/TAO/tao/Resource_Factory.h b/TAO/tao/Resource_Factory.h
index d78937a555c..52f29c06cb1 100644
--- a/TAO/tao/Resource_Factory.h
+++ b/TAO/tao/Resource_Factory.h
@@ -23,6 +23,7 @@
 
 #include "ace/Unbounded_Set.h"
 #include "ace/SString.h"
+#include "ace/CDR_Base.h"
 
 #include "tao/TAO_Export.h"
 
@@ -34,7 +35,6 @@ class TAO_Flushing_Strategy;
 class TAO_Connection_Purging_Strategy;
 class TAO_LF_Strategy;
 
-class TAO_Codeset_Manager;
 class ACE_Lock;
 
 // ****************************************************************
@@ -86,6 +86,34 @@ 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
  *
@@ -175,7 +203,8 @@ public:
    */
   virtual TAO_ProtocolFactorySet *get_protocol_factories (void);
 
-  virtual TAO_Codeset_Manager *get_codeset_manager(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