diff options
| -rw-r--r-- | ChangeLog | 19 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 19 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 19 | ||||
| -rw-r--r-- | THANKS | 3 | ||||
| -rw-r--r-- | ace/Log_Msg.h | 36 | ||||
| -rw-r--r-- | ace/Timer_Queue_Adapters.cpp | 2 | ||||
| -rw-r--r-- | ace/Timer_Queue_Adapters.h | 3 | ||||
| -rw-r--r-- | docs/ACE-bug-process.html | 12 | ||||
| -rw-r--r-- | include/makeinclude/platform_sunos5_sunc++.GNU | 2 |
9 files changed, 94 insertions, 21 deletions
diff --git a/ChangeLog b/ChangeLog index 1c1bd513a89..6e4aaac8970 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Wed May 3 18:07:16 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * include/makeinclude/platform_sunos5_sunc++.GNU (CC_VERSION): + The keywords to check if the version if greater than 5 is "C++" + on Solaris, not "Compilers." Thanks to Rick Weisner + <Rick.Weisner@East.Sun.COM> for reporting this. + Wed May 3 15:08:03 2000 Nanbor Wang <nanbor@cs.wustl.edu> * include/makeinclude/platform_freebsd.GNU: Changed to set @@ -18,6 +25,18 @@ Wed May 3 11:59:14 2000 Carlos O'Ryan <coryan@uci.edu> New <idl_stubs> target that recusively builds all the IDL generated files. +Wed May 3 11:43:05 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/Log_Msg.h: Only call set() in the ACE_{ERROR,DEBUG} macros if + the log_priority_enabled() is non-0, which avoids making + unecessary strcpy() calls. Thanks to Ganesh Pai + <gpai@voicetek.com> for reporting this. + + * ace/Timer_Queue_Adapters (schedule): Make sure to pass + the act to the schedule() method. Also, updated the header file + so that it explains that interval timers aren't implemented. + Thanks to Umar Syyid for reporting these. + Wed May 3 09:49:57 2000 Jeff Parsons <parsons@cs.wustl.edu> * ace/Caching_Utility_T.cpp: diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 1c1bd513a89..6e4aaac8970 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,10 @@ +Wed May 3 18:07:16 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * include/makeinclude/platform_sunos5_sunc++.GNU (CC_VERSION): + The keywords to check if the version if greater than 5 is "C++" + on Solaris, not "Compilers." Thanks to Rick Weisner + <Rick.Weisner@East.Sun.COM> for reporting this. + Wed May 3 15:08:03 2000 Nanbor Wang <nanbor@cs.wustl.edu> * include/makeinclude/platform_freebsd.GNU: Changed to set @@ -18,6 +25,18 @@ Wed May 3 11:59:14 2000 Carlos O'Ryan <coryan@uci.edu> New <idl_stubs> target that recusively builds all the IDL generated files. +Wed May 3 11:43:05 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/Log_Msg.h: Only call set() in the ACE_{ERROR,DEBUG} macros if + the log_priority_enabled() is non-0, which avoids making + unecessary strcpy() calls. Thanks to Ganesh Pai + <gpai@voicetek.com> for reporting this. + + * ace/Timer_Queue_Adapters (schedule): Make sure to pass + the act to the schedule() method. Also, updated the header file + so that it explains that interval timers aren't implemented. + Thanks to Umar Syyid for reporting these. + Wed May 3 09:49:57 2000 Jeff Parsons <parsons@cs.wustl.edu> * ace/Caching_Utility_T.cpp: diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 1c1bd513a89..6e4aaac8970 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,10 @@ +Wed May 3 18:07:16 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * include/makeinclude/platform_sunos5_sunc++.GNU (CC_VERSION): + The keywords to check if the version if greater than 5 is "C++" + on Solaris, not "Compilers." Thanks to Rick Weisner + <Rick.Weisner@East.Sun.COM> for reporting this. + Wed May 3 15:08:03 2000 Nanbor Wang <nanbor@cs.wustl.edu> * include/makeinclude/platform_freebsd.GNU: Changed to set @@ -18,6 +25,18 @@ Wed May 3 11:59:14 2000 Carlos O'Ryan <coryan@uci.edu> New <idl_stubs> target that recusively builds all the IDL generated files. +Wed May 3 11:43:05 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> + + * ace/Log_Msg.h: Only call set() in the ACE_{ERROR,DEBUG} macros if + the log_priority_enabled() is non-0, which avoids making + unecessary strcpy() calls. Thanks to Ganesh Pai + <gpai@voicetek.com> for reporting this. + + * ace/Timer_Queue_Adapters (schedule): Make sure to pass + the act to the schedule() method. Also, updated the header file + so that it explains that interval timers aren't implemented. + Thanks to Umar Syyid for reporting these. + Wed May 3 09:49:57 2000 Jeff Parsons <parsons@cs.wustl.edu> * ace/Caching_Utility_T.cpp: @@ -969,6 +969,9 @@ Steve Vranyes <svranyes1@uswest.net> Jim Melton <Jim.Melton@lmco.com> Ron Klein <rklein@west.raytheon.com> Anuj Singhal <ASinghal@mediasite.com> +Henrik Kai <hka@ddk.de> +Dominic Hughes <dominic@aersoft.ie> +Lior Shalev <lior@bandwiz.com> I would particularly like to thank Paul Stephenson, who worked with me at Ericsson. Paul devised the recursive Makefile scheme that diff --git a/ace/Log_Msg.h b/ace/Log_Msg.h index 320aac41ea3..e41cc7d46b9 100644 --- a/ace/Log_Msg.h +++ b/ace/Log_Msg.h @@ -49,40 +49,48 @@ do { \ int __ace_error = ACE_OS::last_error (); \ ACE_Log_Msg *ace___ = ACE_Log_Msg::instance (); \ - ace___->set (ACE_TEXT_CHAR_TO_TCHAR(__FILE__), __LINE__, 0, __ace_error, ace___->restart (), \ - ace___->msg_ostream (), ace___->msg_callback ()); \ - ace___->log_hexdump X; \ - } while (0) + if (ace___->log_priority_enabled X != 0) { \ + ace___->set (ACE_TEXT_CHAR_TO_TCHAR(__FILE__), __LINE__, 0, __ace_error, ace___->restart (), \ + ace___->msg_ostream (), ace___->msg_callback ()); \ + ace___->log_hexdump X; \ + } \ + } while (0) #define ACE_RETURN(Y) \ do { \ int __ace_error = ACE_OS::last_error (); \ - ACE_Log_Msg::instance ()->set (ACE_TEXT_CHAR_TO_TCHAR(__FILE__), __LINE__, Y, __ace_error); \ + ACE_Log_Msg::instance ()->set (ACE_TEXT_CHAR_TO_TCHAR (__FILE__), __LINE__, Y, __ace_error); \ return Y; \ } while (0) #define ACE_ERROR_RETURN(X, Y) \ do { \ int __ace_error = ACE_OS::last_error (); \ ACE_Log_Msg *ace___ = ACE_Log_Msg::instance (); \ - ace___->set (ACE_TEXT_CHAR_TO_TCHAR(__FILE__), __LINE__, Y, __ace_error, ace___->restart (), \ - ace___->msg_ostream (), ace___->msg_callback ()); \ - ace___->log X; \ + if (ace___->log_priority_enabled X != 0) { \ + ace___->set (ACE_TEXT_CHAR_TO_TCHAR (__FILE__), __LINE__, Y, __ace_error, ace___->restart (), \ + ace___->msg_ostream (), ace___->msg_callback ()); \ + ace___->log X; \ + } \ return Y; \ } while (0) #define ACE_ERROR(X) \ do { \ int __ace_error = ACE_OS::last_error (); \ ACE_Log_Msg *ace___ = ACE_Log_Msg::instance (); \ - ace___->set (ACE_TEXT_CHAR_TO_TCHAR(__FILE__), __LINE__, -1, __ace_error, ace___->restart (), \ - ace___->msg_ostream (), ace___->msg_callback ()); \ - ace___->log X; \ + if (ace___->log_priority_enabled X != 0) { \ + ace___->set (ACE_TEXT_CHAR_TO_TCHAR (__FILE__), __LINE__, -1, __ace_error, ace___->restart (), \ + ace___->msg_ostream (), ace___->msg_callback ()); \ + ace___->log X; \ + } \ } while (0) #define ACE_DEBUG(X) \ do { \ int __ace_error = ACE_OS::last_error (); \ ACE_Log_Msg *ace___ = ACE_Log_Msg::instance (); \ - ace___->set (ACE_TEXT_CHAR_TO_TCHAR(__FILE__), __LINE__, 0, __ace_error, ace___->restart (), \ - ace___->msg_ostream (), ace___->msg_callback ()); \ - ace___->log X; \ + if (ace___->log_priority_enabled X != 0) { \ + ace___->set (ACE_TEXT_CHAR_TO_TCHAR(__FILE__), __LINE__, 0, __ace_error, ace___->restart (), \ + ace___->msg_ostream (), ace___->msg_callback ()); \ + ace___->log X; \ + } \ } while (0) #define ACE_ERROR_INIT(VALUE, FLAGS) \ do { \ diff --git a/ace/Timer_Queue_Adapters.cpp b/ace/Timer_Queue_Adapters.cpp index d37466219e7..c98b0b6c70b 100644 --- a/ace/Timer_Queue_Adapters.cpp +++ b/ace/Timer_Queue_Adapters.cpp @@ -74,7 +74,7 @@ ACE_Async_Timer_Queue_Adapter<TQ>::schedule (ACE_Event_Handler *eh, ACE_UNUSED_ARG (sg); // @@ We still need to implement interval timers... - long tid = this->timer_queue_.schedule (eh, 0, delay); + long tid = this->timer_queue_.schedule (eh, act, delay); if (tid == -1) ACE_ERROR_RETURN ((LM_ERROR, diff --git a/ace/Timer_Queue_Adapters.h b/ace/Timer_Queue_Adapters.h index c908e4d1391..cb43e9d894d 100644 --- a/ace/Timer_Queue_Adapters.h +++ b/ace/Timer_Queue_Adapters.h @@ -49,7 +49,8 @@ public: const ACE_Time_Value &interval = ACE_Time_Value::zero); // Schedule the timer according to the semantics of the // <ACE_Timer_List>. However, this timer gets dispatched via a - // signal, rather than by a user calling <expire>. + // signal, rather than by a user calling <expire>. Note that + // interval timers are not implemented yet. int cancel (long timer_id, const void **act = 0); // Cancel the <timer_id> and pass back the <act> if an address is diff --git a/docs/ACE-bug-process.html b/docs/ACE-bug-process.html index 53a123bf963..908581a7c1e 100644 --- a/docs/ACE-bug-process.html +++ b/docs/ACE-bug-process.html @@ -38,7 +38,7 @@ HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/PROBLEM-REPORT-FORM">$ACE_RO or <A HREF="http://www.cs.wustl.edu/~schmidt/ACE_wrappers/TAO/PROBLEM-REPORT-FORM">$TAO_ROOT/PROBLEM-REPORT-FORM</A> will be given a tracking number and entered into our <A - HREF="http://ace.cs.wustl.edu/bugzilla">bug tracking database</A>. +HREF="http://ace.cs.wustl.edu/bugzilla">bug tracking database</A>. Please use these forms since bug reports that are not submitted in this form are likely to fall through the cracks. <P> @@ -82,9 +82,13 @@ postings. <P> <LI> If it's a general question about how to use ACE or TAO feature we'll try to respond as time permits, though we will also rely on the experience of the ACE and TAO user community to field these types of -questions, as well. If you require consulting support for ACE and/or -TAO, please contact <A HREF="http://www.riverace.com">Riverace</a> or -<A HREF="http://www.theaceorb.com">OCI</A>, as well. <P> +questions, as well. If you have a question about TAO, you should +first check out the TAO <A +HREf="http://www.theaceorb/faq/1.html">online FAQ</A> to see if your +question has already been answered. If you require consulting support +for ACE and/or TAO, please contact <A +HREF="http://www.riverace.com">Riverace</a> or <A +HREF="http://www.theaceorb.com">OCI</A>, as well. <P> </UL> diff --git a/include/makeinclude/platform_sunos5_sunc++.GNU b/include/makeinclude/platform_sunos5_sunc++.GNU index 7387d4c66b3..8709fc20a80 100644 --- a/include/makeinclude/platform_sunos5_sunc++.GNU +++ b/include/makeinclude/platform_sunos5_sunc++.GNU @@ -87,7 +87,7 @@ ifeq (Compilers 4.2,$(findstring Compilers 4.2,$(CC_VERSION))) #### Create template repository to avoid compiler warning. TEMPLATE_REPOSITORY = Templates.DB else # ! 4.2 -ifeq (Compilers 5,$(findstring Compilers 5,$(CC_VERSION))) +ifeq (C++ 5,$(findstring Compilers 5,$(CC_VERSION))) #### CC 5.0 or later #### Inlining appears to cause link problems with early releases of #### CC 5.0. |