diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 9 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 9 | ||||
| -rw-r--r-- | tests/TkReactor_Test.cpp | 6 |
4 files changed, 25 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index bab16c5247d..20146ff7bc0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Nov 16 15:09:25 2000 Carlos O'Ryan <coryan@uci.edu> + + * tests/TkReactor_Test.cpp: + Fixed 'char*' vs. 'const char *' conflict. + Wed Nov 15 14:23:54 2000 Ossama Othman <ossama@uci.edu> * configure.in: @@ -63,8 +68,8 @@ Tue Nov 14 14:19:42 2000 Darrell Brunsch <brunsch@uci.edu> In ACE_Log_Record::print, changed the call to ACE_OS::fprintf to use ACE_TEXT("%s") as the second argument instead of just "%s". This should make logging under ACE_USES_UNICODE readable. - Thanks to James Buck <jim@nowsol.com> and Nick Pratt - <npratt@microstrategy.com> for both reporting this problem and + Thanks to James Buck <jim@nowsol.com> and Nick Pratt + <npratt@microstrategy.com> for both reporting this problem and submitting patches. Tue Nov 14 09:19:16 2000 Carlos O'Ryan <coryan@uci.edu> diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index bab16c5247d..20146ff7bc0 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,8 @@ +Thu Nov 16 15:09:25 2000 Carlos O'Ryan <coryan@uci.edu> + + * tests/TkReactor_Test.cpp: + Fixed 'char*' vs. 'const char *' conflict. + Wed Nov 15 14:23:54 2000 Ossama Othman <ossama@uci.edu> * configure.in: @@ -63,8 +68,8 @@ Tue Nov 14 14:19:42 2000 Darrell Brunsch <brunsch@uci.edu> In ACE_Log_Record::print, changed the call to ACE_OS::fprintf to use ACE_TEXT("%s") as the second argument instead of just "%s". This should make logging under ACE_USES_UNICODE readable. - Thanks to James Buck <jim@nowsol.com> and Nick Pratt - <npratt@microstrategy.com> for both reporting this problem and + Thanks to James Buck <jim@nowsol.com> and Nick Pratt + <npratt@microstrategy.com> for both reporting this problem and submitting patches. Tue Nov 14 09:19:16 2000 Carlos O'Ryan <coryan@uci.edu> diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index bab16c5247d..20146ff7bc0 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,8 @@ +Thu Nov 16 15:09:25 2000 Carlos O'Ryan <coryan@uci.edu> + + * tests/TkReactor_Test.cpp: + Fixed 'char*' vs. 'const char *' conflict. + Wed Nov 15 14:23:54 2000 Ossama Othman <ossama@uci.edu> * configure.in: @@ -63,8 +68,8 @@ Tue Nov 14 14:19:42 2000 Darrell Brunsch <brunsch@uci.edu> In ACE_Log_Record::print, changed the call to ACE_OS::fprintf to use ACE_TEXT("%s") as the second argument instead of just "%s". This should make logging under ACE_USES_UNICODE readable. - Thanks to James Buck <jim@nowsol.com> and Nick Pratt - <npratt@microstrategy.com> for both reporting this problem and + Thanks to James Buck <jim@nowsol.com> and Nick Pratt + <npratt@microstrategy.com> for both reporting this problem and submitting patches. Tue Nov 14 09:19:16 2000 Carlos O'Ryan <coryan@uci.edu> diff --git a/tests/TkReactor_Test.cpp b/tests/TkReactor_Test.cpp index 45f37469a2c..f02171d7608 100644 --- a/tests/TkReactor_Test.cpp +++ b/tests/TkReactor_Test.cpp @@ -288,12 +288,14 @@ main (int argc, char *argv[]) exit (1); } // set up callback - Tcl_CreateCommand (tcl_interp, "pressme", inc_count, "label_var", 0); + char label_var_name[] = "label_var"; + Tcl_CreateCommand (tcl_interp, "pressme", inc_count, + label_var_name, 0); // Register callback for X Timer (void) Tk_CreateTimerHandler (1000, inc_tmo, - "label_var"); + label_var_name); // It will perform Tk Main Loop ACE_TkReactor reactor; |