ChangeLogTag:Thu Oct 7 16:45:21 2004 Steve Huston <shuston@riverace.com>

10 files changed, 75 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index e74efdae7d4..acf60751482 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,30 @@
+Thu Oct  7 16:45:21 2004  Steve Huston  <shuston@riverace.com>
+
+	* bin/MakeProjectCreator/config/global.features: Added uses_wchar = 0
+	  as a default. Says not to use ACE_USES_WCHAR. No affect on
+	  ACE_HAS_WCHAR (a platform's ability to handle wide-char). This
+	  setting is primarily to avoid those areas of ACE's examples that
+	  aren't coded to work correctly with both narrow and wide chars.
+
+	* apps/drwho/drwho.mpc:
+	* apps/gperf/src/gperf.mpc:
+	* apps/gperf/tests/gperf_test.mpb:
+	* apps/soreduce/soreduce.mpc:
+	* examples/C++NPv1/C++NPv1.mpc:
+	* examples/C++NPv2/C++NPv2.mpc:
+	  Added "avoids += uses_wchar" to projects that don't builds cleanly
+	  with ACE_USES_WCHAR. For drwho/gperf/soreduce, they weren't designed
+	  for wide-char use and the changes to make them so are widespread.
+	  For C++NPv1/2, there's code that would need to change, but is used
+	  in the book prior to where narrow/wide char handling is introduced.
+	  To keep the code in sync with the books, just don't try to build
+	  this on wide-char builds.
+
+	* m4/ace.m4: Added new configure option, --with-uses-wchar. If yes,
+	  then ACE_USES_WCHAR is set. Defaults to no.
+
+	* m4/config_h.m4: Added AH_TEMPLATE for ACE_USES_WCHAR.
+
 Thu Oct  7 11:42:40 2004  Chad Elliott  <elliott_c@ociweb.com>
 
         * bin/tao_orb_tests.lst:
diff --git a/apps/drwho/drwho.mpc b/apps/drwho/drwho.mpc
index 351376f1697..79631f8168d 100644
--- a/apps/drwho/drwho.mpc
+++ b/apps/drwho/drwho.mpc
@@ -3,6 +3,7 @@
 
 project(*-client) : aceexe {
   requires += rwho
+  avoids += uses_wchar
   Source_Files {
     Protocol_Manager.cpp
     Drwho_Node.cpp
@@ -46,6 +47,7 @@ project(*-client) : aceexe {
 
 project(*-server) : aceexe {
   requires += rwho
+  avoids += uses_wchar
   Source_Files {
     Protocol_Manager.cpp
     Drwho_Node.cpp
diff --git a/apps/gperf/src/gperf.mpc b/apps/gperf/src/gperf.mpc
index b5a682d98d4..b8dc0ad1d74 100644
--- a/apps/gperf/src/gperf.mpc
+++ b/apps/gperf/src/gperf.mpc
@@ -3,6 +3,7 @@
 
 project(gperf) : aceexe, core, crosscompile {
   install = $(ACE_ROOT)/bin
+  avoids += uses_wchar
   exename = gperf
   Source_Files {
     gperf.cpp
diff --git a/apps/gperf/tests/gperf_test.mpb b/apps/gperf/tests/gperf_test.mpb
index c4615b1adc4..857de94aaf5 100644
--- a/apps/gperf/tests/gperf_test.mpb
+++ b/apps/gperf/tests/gperf_test.mpb
@@ -3,6 +3,7 @@
 
 project: aceexe, crosscompile {
   after += gperf
+  avoids += uses_wchar
   Define_Custom(GPERF) {
     command          = $(ACE_ROOT)/bin/gperf
     libpath         += $(ACE_ROOT)/lib
diff --git a/apps/soreduce/soreduce.mpc b/apps/soreduce/soreduce.mpc
index 0537c9e4102..18f2e917796 100644
--- a/apps/soreduce/soreduce.mpc
+++ b/apps/soreduce/soreduce.mpc
@@ -1,6 +1,7 @@
 // $Id$
 
 project(soreduce) : aceexe {
+  avoids += uses_wchar
   exename = soreduce
   Source_Files {
     Signature.cpp
diff --git a/bin/MakeProjectCreator/config/global.features b/bin/MakeProjectCreator/config/global.features
index f71b9d30acd..87a01429da6 100644
--- a/bin/MakeProjectCreator/config/global.features
+++ b/bin/MakeProjectCreator/config/global.features
@@ -1,3 +1,4 @@
+// $Id$
 // The global features file contains the default feature settings.
 // By default, if a feature isn't listed here then it is enabled.
 // If it is listed, then the value assigned to the feature is interpreted
@@ -33,3 +34,4 @@ dummy_label   = 0
 cidl          = 0
 boost         = 0
 wince         = 0
+uses_wchar    = 0
diff --git a/examples/C++NPv1/C++NPv1.mpc b/examples/C++NPv1/C++NPv1.mpc
index 85bfa84a619..f7d3f626ff4 100644
--- a/examples/C++NPv1/C++NPv1.mpc
+++ b/examples/C++NPv1/C++NPv1.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(*Iterative_Logging_Server) : aceexe {
+  avoids += uses_wchar
   exename = iterative_logging_server
   Source_Files {
     Iterative_Logging_Server.cpp
@@ -11,6 +12,7 @@ project(*Iterative_Logging_Server) : aceexe {
 }
 
 project(*Logging_Client) : aceexe {
+  avoids += uses_wchar
   exename = logging_client
   Source_Files {
     Logging_Client.cpp
@@ -18,6 +20,7 @@ project(*Logging_Client) : aceexe {
 }
 
 project(*PPC_Logging_Server) : aceexe {
+  avoids += uses_wchar
   exename = ppc_logging_server
   Source_Files {
     Process_Per_Connection_Logging_Server.cpp
@@ -27,6 +30,7 @@ project(*PPC_Logging_Server) : aceexe {
 }
 
 project(*Reactive_Logging_Server) : aceexe {
+  avoids += uses_wchar
   exename = reactive_logging_server
   Source_Files {
     Reactive_Logging_Server.cpp
@@ -36,6 +40,7 @@ project(*Reactive_Logging_Server) : aceexe {
 }
 
 project(*Reactive_Logging_Server_Ex) : aceexe {
+  avoids += uses_wchar
   exename = reactive_logging_server_ex
   Source_Files {
     Reactive_Logging_Server_Ex.cpp
@@ -45,6 +50,7 @@ project(*Reactive_Logging_Server_Ex) : aceexe {
 }
 
 project(*RTTPC_Logging_Server) : aceexe {
+  avoids += uses_wchar
   exename = RTTPC_logging_server
   Source_Files {
     RT_Thread_Per_Connection_Logging_Server.cpp
@@ -54,10 +60,11 @@ project(*RTTPC_Logging_Server) : aceexe {
 }
 
 project(*TPC_Logging_Server) : aceexe {
+  avoids += uses_wchar
   exename = tpc_logging_server
   Source_Files {
     Thread_Per_Connection_Logging_Server.cpp
     Logging_Server.cpp
     Logging_Handler.cpp
   }
-}
\ No newline at end of file
+}
diff --git a/examples/C++NPv2/C++NPv2.mpc b/examples/C++NPv2/C++NPv2.mpc
index c8677ca3bf0..5e21c622a7a 100644
--- a/examples/C++NPv2/C++NPv2.mpc
+++ b/examples/C++NPv2/C++NPv2.mpc
@@ -2,6 +2,7 @@
 // $Id$
 
 project(*AC_CLD) : acelib, ssl {
+  avoids += uses_wchar
   sharedname = AC_CLD
   dynamicflags = AC_CLD_BUILD_DLL
   Source_Files {
@@ -19,6 +20,7 @@ project(*AIO_CLD) : acelib, ssl {
 }
 
 project(*CLD) : acelib {
+  avoids += uses_wchar
   sharedname = CLD
   dynamicflags = CLD_BUILD_DLL
   Source_Files {
@@ -45,6 +47,7 @@ project(*Display_Logfile) : aceexe {
 }
 
 project(*Reactor_Log_Server) : aceexe {
+  avoids += uses_wchar
   exename = reactor_logging_server
   Source_Files {
     Logging_Acceptor.cpp
@@ -56,6 +59,7 @@ project(*Reactor_Log_Server) : aceexe {
 }
 
 project(*Select_Reactor_Log_Server) : aceexe {
+  avoids += uses_wchar
   exename = select_reactor_loggin_server
   Source_Files {
     Logging_Acceptor.cpp
@@ -67,6 +71,7 @@ project(*Select_Reactor_Log_Server) : aceexe {
 }
 
 project(*SLD) : acelib {
+  avoids += uses_wchar
   sharedname = SLD
   dynamicflags = SLD_BUILD_DLL
   Source_Files {
@@ -78,6 +83,7 @@ project(*SLD) : acelib {
 }
 
 project(*SLDex) : acelib {
+  avoids += uses_wchar
   sharedname = SLDex
   dynamicflags = SLDEX_BUILD_DLL
   Source_Files {
@@ -99,6 +105,7 @@ project(*SR_Configurable_Log_Server) : aceexe {
 }
 
 project(*TP_Reactor_Log_Server) : aceexe {
+  avoids += uses_wchar
   exename = tp_reactor_logging_server
   Source_Files {
     Logging_Acceptor.cpp
@@ -110,6 +117,7 @@ project(*TP_Reactor_Log_Server) : aceexe {
 }
 
 project(*TPCLS) : acelib, ssl {
+  avoids += uses_wchar
   sharedname = TPCLS
   dynamicflags = TPCLS_BUILD_DLL
   Source_Files {
@@ -119,6 +127,7 @@ project(*TPCLS) : acelib, ssl {
 }
 
 project(*TPLS) : acelib {
+  avoids += uses_wchar
   sharedname = TPLS
   dynamicflags = TPLS_BUILD_DLL
   Source_Files {
@@ -130,6 +139,7 @@ project(*TPLS) : acelib {
 }
 
 project(*WFMO_Reactor_Log_Server) : aceexe, wfmo {
+  avoids += uses_wchar
   exename = wfmo_reactor_logging_server
   Source_Files {
     Logging_Acceptor.cpp
diff --git a/m4/ace.m4 b/m4/ace.m4
index 4b8d34bfe72..95126668a71 100644
--- a/m4/ace.m4
+++ b/m4/ace.m4
@@ -487,6 +487,7 @@ dnl line, then "no_x" is set to "yes."
  ACE_WITH_RMCAST
  ACE_WITH_QOS
  ACE_WITH_SSL
+ ACE_WITH_USES_WCHAR
 
  AC_ARG_WITH([tao],
   AS_HELP_STRING(--with-tao,build TAO (the ACE ORB) [[[yes]]]),
@@ -889,3 +890,24 @@ AC_CACHE_CHECK([whether to compile/use the ACE_SSL library],
                [ace_user_with_ssl], [ace_user_with_ssl=yes])
 AM_CONDITIONAL([BUILD_SSL], [test X$ace_user_with_ssl = Xyes])
 ])
+
+AC_DEFUN([ACE_WITH_USES_WCHAR],
+[AC_ARG_WITH([uses-wchar],
+             AS_HELP_STRING([--with-uses-wchar],
+                            [select use of wide characters [[no]]]),
+             [case "${withval}" in
+               yes) 
+                AC_DEFINE([ACE_USES_WCHAR])
+                ace_user_with_wide_char=yes
+                ;;
+               no)
+                ace_user_with_wide_char=no
+                ;;
+               *)
+                AC_MSG_ERROR(bad value ${withval} for --with-uses-wchar)
+                ;;
+              esac])
+AC_CACHE_CHECK([whether to use wide characters internally],
+               [ace_user_with_wide_char], [ace_user_with_wide_char=no])
+AM_CONDITIONAL([BUILD_USES_WCHAR], [test X$ace_user_with_wide_char = Xyes])
+])
diff --git a/m4/config_h.m4 b/m4/config_h.m4
index abf6f28fa43..0e01b084b28 100644
--- a/m4/config_h.m4
+++ b/m4/config_h.m4
@@ -809,6 +809,7 @@ AH_TEMPLATE([ACE_HAS_UNIXWARE_SVR4_SIGNAL_T],
    platforms])
 
 AH_TEMPLATE([ACE_HAS_WCHAR],[Platform/compiler supports wchar_t])
+AH_TEMPLATE([ACE_USES_WCHAR],[ACE is built to use wide characters internally])
 
 AH_TEMPLATE([ACE_HAS_TYPENAME_KEYWORD],
 [Compiler supports the C++ typename keyword])