diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 6 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 6 | ||||
| -rw-r--r-- | ace/Connector.h | 1 | ||||
| -rw-r--r-- | tests/Get_Opt_Test.cpp | 10 |
5 files changed, 23 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index 4a128352cbc..407948bc460 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Dec 27 09:52:56 2001 Douglas C. Schmidt <schmidt@siesta.cs.wustl.edu> + + * tests/Get_Opt_Test.cpp: Added ACE_TEXT macros to the various + strings so they will compile on Unicode builds. Thanks to + Venkita for noticing this! + Thu Dec 27 14:53:49 2001 Steve Huston <shuston@riverace.com> * ace/SSL/SSL_SOCK_Acceptor.(h cpp): diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 4a128352cbc..407948bc460 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,9 @@ +Thu Dec 27 09:52:56 2001 Douglas C. Schmidt <schmidt@siesta.cs.wustl.edu> + + * tests/Get_Opt_Test.cpp: Added ACE_TEXT macros to the various + strings so they will compile on Unicode builds. Thanks to + Venkita for noticing this! + Thu Dec 27 14:53:49 2001 Steve Huston <shuston@riverace.com> * ace/SSL/SSL_SOCK_Acceptor.(h cpp): diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 4a128352cbc..407948bc460 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,9 @@ +Thu Dec 27 09:52:56 2001 Douglas C. Schmidt <schmidt@siesta.cs.wustl.edu> + + * tests/Get_Opt_Test.cpp: Added ACE_TEXT macros to the various + strings so they will compile on Unicode builds. Thanks to + Venkita for noticing this! + Thu Dec 27 14:53:49 2001 Steve Huston <shuston@riverace.com> * ace/SSL/SSL_SOCK_Acceptor.(h cpp): diff --git a/ace/Connector.h b/ace/Connector.h index 6786089c0b3..5def25cba94 100644 --- a/ace/Connector.h +++ b/ace/Connector.h @@ -127,7 +127,6 @@ public: ACE_Connector (ACE_Reactor *r = ACE_Reactor::instance (), int flags = 0); - /** * Initialize a connector. <flags> indicates how <SVC_HANDLER>'s * should be initialized prior to being activated. Right now, the diff --git a/tests/Get_Opt_Test.cpp b/tests/Get_Opt_Test.cpp index a193cd7389d..ae81088e4d0 100644 --- a/tests/Get_Opt_Test.cpp +++ b/tests/Get_Opt_Test.cpp @@ -42,14 +42,14 @@ parse_args (int test_number, // Test the skip_argv0 for the first test only. if (skip_argv0 > 0) { - test = "Test_"; + test = ACE_TEXT ("Test_"); ACE_TCHAR s[20]; test += ACE_OS::itoa (test_number, s, 10); - test += " "; + test += ACE_TEXT (" "); } test += test_args; - optstring += "fr:o::sW;"; + optstring += ACE_TEXT ("fr:o::sW;"); ACE_DEBUG ((LM_INFO, " TEST %d ************************************************************\n", @@ -120,8 +120,8 @@ parse_args (int test_number, ACE_DEBUG ((LM_INFO, " Found long option \"%s\" %s %s\n", get_opt.long_option (), - get_opt.opt_arg () ? "with argument:" : "", - get_opt.opt_arg () ? get_opt.opt_arg () : "")); + get_opt.opt_arg () ? ACE_TEXT ("with argument:") : ACE_TEXT (""), + get_opt.opt_arg () ? get_opt.opt_arg () : ACE_TEXT (""))); break; case 'f': // This flag was added in both the optstring in the ctor and with |