ChangeLog tag: Tue May 20 12:43:58 2003 Phil Mesnier <mesnier_p@ociweb.com>

5 files changed, 19 insertions, 28 deletions

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 775b9bcaadf..7a38bebfcf1 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,18 @@
+Tue May 20 12:43:58 2003  Phil Mesnier  <mesnier_p@ociweb.com>
+
+        * tao/Codeset_Manager.cpp: Use the old codeset default macros from
+          corbafwd.h to initialize the default codeset values in the
+          codeset manager. These may still be overridden via the resource
+          manager if desired.
+
+        * tao/Any.cpp:
+        * tao/Any.h: Cleaned up unneeded references to codeset translator
+          factory class and header.
+
+        * tao/Exception.cpp: Removed old ACE_MVS code for alternative
+          codeset translator. This code would not compile if enabled.
+
+
 Tue May 20 11:11:55 2003  Balachandran Natarajan  <bala@dre.vanderbilt.edu>
 
 	* tests/Smart_Proxies/Makefile: Added -lTAO_SmartProxies to the
@@ -32,7 +47,7 @@ Mon May 19 11:05:26 2003  Ossama Othman  <ossama@dre.vanderbilt.edu>
 	  reference count once more.  This is not needed as we already
 	  hold a reference to the handler.  Therefore we discard this
 	  second reference.  Fixes a memory leak.  [Bug 1506]
-	  
+
 	  (retrieve_credentials):
 
 	  For the default certificate and private key case, assign the
diff --git a/TAO/tao/Any.cpp b/TAO/tao/Any.cpp
index 22c9e52295b..8985415eeda 100644
--- a/TAO/tao/Any.cpp
+++ b/TAO/tao/Any.cpp
@@ -7,7 +7,6 @@
 #include "tao/Any_Dual_Impl_T.h"
 
 #include "tao/ORB_Core.h"
-#include "tao/Codeset_Translator_Factory.h"
 
 #if !defined (__ACE_INLINE__)
 # include "tao/Any.i"
diff --git a/TAO/tao/Any.h b/TAO/tao/Any.h
index dd0395475c6..6f70d0e3658 100644
--- a/TAO/tao/Any.h
+++ b/TAO/tao/Any.h
@@ -30,8 +30,6 @@ namespace TAO
   class Any_Impl;
 };
 
-class TAO_Codeset_Translator_Factory;
-
 namespace CORBA
 {
   /**
@@ -437,7 +435,7 @@ TAO_Export void operator<<= (CORBA::Any_var &, CORBA::Any::from_wstring);
 /// These are not required by the spec, but will make users
 /// of other ORBs that are used to them more comfortable.
 
-TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &, 
+TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
                                        CORBA::Short &);
 TAO_Export CORBA::Boolean operator>>= (const CORBA::Any_var &,
                                        CORBA::UShort &);
diff --git a/TAO/tao/Codeset_Manager.cpp b/TAO/tao/Codeset_Manager.cpp
index 90db073b321..13005448634 100644
--- a/TAO/tao/Codeset_Manager.cpp
+++ b/TAO/tao/Codeset_Manager.cpp
@@ -19,12 +19,11 @@ ACE_RCSID(tao, Codeset_Manager, "$Id$")
 
 /// NCS for char is defaulted to ISO 8859-1:1987; Latin Alphabet No. 1
 CONV_FRAME::CodeSetId
-TAO_Codeset_Manager::default_char_codeset = 0x00010001;
+TAO_Codeset_Manager::default_char_codeset = TAO_DEFAULT_CHAR_CODESET_ID;
 /// NCS for wchar is not defaulted by the CORBA specification, but a default
 /// may be set here if desired
 CONV_FRAME::CodeSetId
-TAO_Codeset_Manager::default_wchar_codeset = 0;
-
+TAO_Codeset_Manager::default_wchar_codeset = TAO_DEFAULT_WCHAR_CODESET_ID;
 
 TAO_Codeset_Manager::TAO_Codeset_Manager()
   :codeset_info_ (),
diff --git a/TAO/tao/Exception.cpp b/TAO/tao/Exception.cpp
index 25ddb7bfe30..721cdcc55a5 100644
--- a/TAO/tao/Exception.cpp
+++ b/TAO/tao/Exception.cpp
@@ -15,10 +15,6 @@
 #include "tao/ORB_Core.h"
 #include "tao/Dynamic_Adapter.h"
 
-#if defined(ACE_MVS)
-#include "ace/Codeset_IBM1047.h"
-#endif /* ACE_MVS */
-
 #if !defined (__ACE_INLINE__)
 # include "tao/Exception.i"
 #endif /* __ACE_INLINE__ */
@@ -872,28 +868,12 @@ TAO_Exceptions::make_unknown_user_typecode (CORBA::TypeCode_ptr &tcp
                                             ACE_ENV_ARG_DECL)
 {
   // Create the TypeCode for the CORBA::UnknownUserException.
-
-#if defined(ACE_MVS)
-  // @@ We need to use a translator to make sure that all TypeCodes
-  // are stored in ISO8859 form, the problem is that this hack does
-  // not scale as more native sets have to be supported
-
-  ACE_IBM1047_ISO8859 translator;
-  TAO_OutputCDR stream (0,
-                        ACE_CDR_BYTE_ORDER,
-                        TAO_Exceptions::global_allocator_,
-                        TAO_Exceptions::global_allocator_,
-                        TAO_Exceptions::global_allocator_,
-                        ACE_DEFAULT_CDR_MEMCPY_TRADEOFF,
-                        &translator);
-#else
   TAO_OutputCDR stream (0,
                         ACE_CDR_BYTE_ORDER,
                         TAO_Exceptions::global_allocator_,
                         TAO_Exceptions::global_allocator_,
                         TAO_Exceptions::global_allocator_,
                         ACE_DEFAULT_CDR_MEMCPY_TRADEOFF);
-#endif /* ACE_MVS */
 
   const char *interface_id =
     "IDL:omg.org/CORBA/UnknownUserException:1.0";