Mon Sep 20 13:24:56 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * ASNMP/agent/agent.mpc:
        * ASNMP/agent/main.cpp:
          Enable for wchar, thanks to Christian Freund <freund at wrz dot de>
          for reporting this and providing a patch, fixes bugzilla 3889

        * ace/String_Base.h:
        * apps/JAWS3/http/HTTP_Service_Handler.h:
        * apps/JAWS3/small/SS_Service_Handler.h:
          Fixed typo in comment

        * ace/config-win32-borland.h:
          Some updates based on QC emails

        * debian/libtao-dev.install:
        * debian/mpc-ace.install:
          Fixed paths

9 files changed, 45 insertions, 19 deletions

diff --git a/ACE/ASNMP/agent/agent.mpc b/ACE/ASNMP/agent/agent.mpc
index 4579c29d458..c83c707ad78 100644
--- a/ACE/ASNMP/agent/agent.mpc
+++ b/ACE/ASNMP/agent/agent.mpc
@@ -4,7 +4,6 @@ project (asnmp_agent) : aceexe {
   exename = agent
   after += asnmp_lib
   libs  += asnmp
-  avoids += uses_wchar
   includes += $(ACE_ROOT)/ASNMP
   source_files {
     agent_impl.cpp
diff --git a/ACE/ASNMP/agent/main.cpp b/ACE/ASNMP/agent/main.cpp
index e304d59f392..53580073aaf 100644
--- a/ACE/ASNMP/agent/main.cpp
+++ b/ACE/ASNMP/agent/main.cpp
@@ -6,6 +6,7 @@
 #include "ace/config-all.h"
 #include "snmp_agent.h"
 #include "ace/ACE.h"
+#include "ace/Argv_Type_Converter.h"
 
 int
 ACE_TMAIN(int argc, ACE_TCHAR *argv[])
@@ -13,7 +14,12 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[])
   ACE::init ();
   snmp_agent the_agent;
 
+#ifdef ACE_USES_WCHAR
+  ACE_Argv_Type_Converter arg_converter(argc, argv);
+  if (the_agent.set_args(arg_converter.get_ASCII_argc (), arg_converter.get_ASCII_argv()))
+#else
   if (the_agent.set_args(argc, argv))
+#endif
     return 1;
 
   if (!the_agent.valid()) {
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index d25740e1421..4c729903493 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,22 @@
+Mon Sep 20 13:24:56 UTC 2010  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ASNMP/agent/agent.mpc:
+        * ASNMP/agent/main.cpp:
+          Enable for wchar, thanks to Christian Freund <freund at wrz dot de>
+          for reporting this and providing a patch, fixes bugzilla 3889
+
+        * ace/String_Base.h:
+        * apps/JAWS3/http/HTTP_Service_Handler.h:
+        * apps/JAWS3/small/SS_Service_Handler.h:
+          Fixed typo in comment
+
+        * ace/config-win32-borland.h:
+          Some updates based on QC emails
+
+        * debian/libtao-dev.install:
+        * debian/mpc-ace.install:
+          Fixed paths
+
 Fri Sep 17 20:14:33 UTC 2010  Adam Mitz  <mitza@ociweb.com>
 
         * ace/FlReactor/ace_flreactor.mpc:
diff --git a/ACE/ace/String_Base.h b/ACE/ace/String_Base.h
index ae775c35dc3..3ba0dbba6b8 100644
--- a/ACE/ace/String_Base.h
+++ b/ACE/ace/String_Base.h
@@ -99,7 +99,7 @@ public:
    *
    * @param s Zero terminated input string
    * @param the_allocator ACE_Allocator associated with string
-   * @param release Allocator responsible(true)/not reponsible(false) for
+   * @param release Allocator responsible(true)/not responsible(false) for
    *    freeing memory.
    * @return ACE_String_Base containing const ACE_CHAR_T *s
    */
@@ -120,7 +120,7 @@ public:
    * @param s Non-zero terminated input string
    * @param len Length of non-zero terminated input string
    * @param the_allocator ACE_Allocator associated with string
-   * @param release Allocator responsible(true)/not reponsible(false) for
+   * @param release Allocator responsible(true)/not responsible(false) for
    *    freeing memory.
    * @return ACE_String_Base containing const ACE_CHAR_T *s
    */
@@ -224,7 +224,7 @@ public:
    *   used, and instead the internal buffer is set to NULL_String_.
    *
    * @param s Null terminated input string
-   * @param release Allocator responsible(true)/not reponsible(false) for
+   * @param release Allocator responsible(true)/not responsible(false) for
    *    freeing memory.
    */
   void set (const ACE_CHAR_T * s, bool release = true);
@@ -244,7 +244,7 @@ public:
    *
    *  @param s Non-zero terminated input string
    *  @param len Length of input string 's'
-   *  @param release Allocator responsible(true)/not reponsible(false) for
+   *  @param release Allocator responsible(true)/not responsible(false) for
    *    freeing memory.
    */
   void set (const ACE_CHAR_T * s, size_type len, bool release);
diff --git a/ACE/ace/config-win32-borland.h b/ACE/ace/config-win32-borland.h
index 007fb36227f..52f3843f362 100644
--- a/ACE/ace/config-win32-borland.h
+++ b/ACE/ace/config-win32-borland.h
@@ -144,8 +144,10 @@
 # define ACE_LACKS_PRAGMA_ONCE 1
 #endif
 
-#define ACE_LACKS_ISWCTYPE
-#define ACE_LACKS_ISCTYPE
+#if (__BORLANDC__ < 0x630)
+# define ACE_LACKS_ISWCTYPE
+# define ACE_LACKS_ISCTYPE
+#endif
 
 #if (__BORLANDC__ < 0x620)
 // Older Borland compilers can't handle assembly in inline methods or
diff --git a/ACE/apps/JAWS3/http/HTTP_Service_Handler.h b/ACE/apps/JAWS3/http/HTTP_Service_Handler.h
index 6444c727941..3b469593dcb 100644
--- a/ACE/apps/JAWS3/http/HTTP_Service_Handler.h
+++ b/ACE/apps/JAWS3/http/HTTP_Service_Handler.h
@@ -20,7 +20,7 @@ class JAWS_HTTP_Service_Handler
 //     An HTTP Server service handler.
 //
 // = DESCRIPTION
-//     This class is reponsible for initializing the JAWS_Protocol_Handler
+//     This class is responsible for initializing the JAWS_Protocol_Handler
 //     with the correct state and data so that the HTTP Server can
 //     be properly serviced by the underlying framework.
 //
diff --git a/ACE/apps/JAWS3/small/SS_Service_Handler.h b/ACE/apps/JAWS3/small/SS_Service_Handler.h
index 7287e659d6e..482ccfdb049 100644
--- a/ACE/apps/JAWS3/small/SS_Service_Handler.h
+++ b/ACE/apps/JAWS3/small/SS_Service_Handler.h
@@ -21,7 +21,7 @@ class TeraSS_Service_Handler
 //     The Small Server service handler.
 //
 // = DESCRIPTION
-//     This class is reponsible for initializing the JAWS_Protocol_Handler
+//     This class is responsible for initializing the JAWS_Protocol_Handler
 //     with the correct state and data so that the Small Server can
 //     be properly serviced by the underlying framework.
 //
diff --git a/ACE/debian/libtao-dev.install b/ACE/debian/libtao-dev.install
index 3840f1eb44d..b908fb37fca 100644
--- a/ACE/debian/libtao-dev.install
+++ b/ACE/debian/libtao-dev.install
@@ -62,8 +62,8 @@ usr/lib/libTAO_Valuetype.so
 usr/lib/libTAO_DiffServPolicy.so
 usr/include/tao/DiffServPolicy
 usr/lib/libTAO_ZlibCompressor.so
-../../ACE_wrappers/TAO/MPC/config        usr/share/ace/TAO/MPC
-../../ACE_wrappers/TAO/rules.tao.GNU     usr/share/ace/TAO
+TAO/MPC/config        usr/share/ace/TAO/MPC
+TAO/rules.tao.GNU     usr/share/ace/TAO
 usr/lib/libTAO_IFR_BE.so
 usr/lib/libTAO_IDL_FE.so
 usr/lib/libTAO_IDL_BE.so
diff --git a/ACE/debian/mpc-ace.install b/ACE/debian/mpc-ace.install
index 3568a9feacf..5d2d122ac7a 100644
--- a/ACE/debian/mpc-ace.install
+++ b/ACE/debian/mpc-ace.install
@@ -1,10 +1,10 @@
 usr/bin/mpc-ace
 usr/bin/mwc-ace
-../bin/m[p,w]c.pl          usr/share/ace/bin
-../bin/MakeProjectCreator  usr/share/ace/bin
-../MPC/config              usr/share/ace/MPC
-../MPC/modules             usr/share/ace/MPC
-../MPC/templates           usr/share/ace/MPC
-../MPC/*.pl                usr/share/ace/MPC
-../MPC/ChangeLog           usr/share/ace/MPC
-../bin/PerlACE             usr/share/ace/bin
+bin/m[p,w]c.pl          usr/share/ace/bin
+bin/MakeProjectCreator  usr/share/ace/bin
+MPC/config              usr/share/ace/MPC
+MPC/modules             usr/share/ace/MPC
+MPC/templates           usr/share/ace/MPC
+MPC/*.pl                usr/share/ace/MPC
+MPC/ChangeLog           usr/share/ace/MPC
+bin/PerlACE             usr/share/ace/bin