diff options
| -rw-r--r-- | ace/Containers_T.cpp | 8 | ||||
| -rw-r--r-- | ace/Local_Name_Space_T.cpp | 4 | ||||
| -rw-r--r-- | ace/Name_Request_Reply.cpp | 4 | ||||
| -rw-r--r-- | ace/Service_Config.cpp | 4 | ||||
| -rw-r--r-- | ace/Service_Manager.cpp | 4 | ||||
| -rw-r--r-- | ace/Svc_Conf.y | 4 | ||||
| -rw-r--r-- | ace/Svc_Conf_y.cpp | 4 | ||||
| -rw-r--r-- | ace/Time_Request_Reply.cpp | 4 | ||||
| -rw-r--r-- | ace/Trace.cpp | 4 |
9 files changed, 20 insertions, 20 deletions
diff --git a/ace/Containers_T.cpp b/ace/Containers_T.cpp index 2fd69838f87..2088a478d69 100644 --- a/ace/Containers_T.cpp +++ b/ace/Containers_T.cpp @@ -399,9 +399,9 @@ ACE_Unbounded_Queue<T>::dump (void) const ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\ncur_size_ = %d\n"), this->cur_size_)); T *item = 0; -#if !defined (ACE_NDEBUG) +#if !defined (ACE_NLOGGING) size_t count = 1; -#endif /* ! ACE_NDEBUG */ +#endif /* ! ACE_NLOGGING */ for (ACE_Unbounded_Queue_Iterator<T> iter (*(ACE_Unbounded_Queue<T> *) this); iter.next (item) != 0; @@ -1493,9 +1493,9 @@ ACE_Unbounded_Set<T>::dump (void) const ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\ncur_size_ = %d\n"), this->cur_size_)); T *item = 0; -#if !defined (ACE_NDEBUG) +#if !defined (ACE_NLOGGING) size_t count = 1; -#endif /* ! ACE_NDEBUG */ +#endif /* ! ACE_NLOGGING */ for (ACE_Unbounded_Set_Iterator<T> iter (*(ACE_Unbounded_Set<T> *) this); iter.next (item) != 0; diff --git a/ace/Local_Name_Space_T.cpp b/ace/Local_Name_Space_T.cpp index eaf6359249d..37789a779a7 100644 --- a/ace/Local_Name_Space_T.cpp +++ b/ace/Local_Name_Space_T.cpp @@ -760,9 +760,9 @@ ACE_Local_Name_Space<ACE_MEM_POOL_2, ACE_LOCK>::dump_i (void) const { char *key = map_entry->ext_id_.char_rep (); char *value = map_entry->int_id_.value ().char_rep (); -#if !defined (ACE_NDEBUG) +#if !defined (ACE_NLOGGING) const char *type = map_entry->int_id_.type (); -#endif /* ! ACE_NDEBUG */ +#endif /* ! ACE_NLOGGING */ ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("key=%s\nvalue=%s\ntype=%s\n"), key, value, type)); diff --git a/ace/Name_Request_Reply.cpp b/ace/Name_Request_Reply.cpp index 9b47196b6d9..a92caf5641c 100644 --- a/ace/Name_Request_Reply.cpp +++ b/ace/Name_Request_Reply.cpp @@ -378,9 +378,9 @@ ACE_Name_Request::dump (void) const ASYS_TEXT ("blocking forever\n"))); else { -#if !defined (ACE_NDEBUG) +#if !defined (ACE_NLOGGING) ACE_Time_Value tv = this->timeout (); -#endif /* ! ACE_NDEBUG */ +#endif /* ! ACE_NLOGGING */ ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("waiting for %ld secs and %ld usecs\n"), tv.sec (), diff --git a/ace/Service_Config.cpp b/ace/Service_Config.cpp index 415b91a087a..9d1780e9edd 100644 --- a/ace/Service_Config.cpp +++ b/ace/Service_Config.cpp @@ -654,9 +654,9 @@ ACE_Service_Config::reconfigure (void) if (ACE::debug ()) { -#if !defined (ACE_NDEBUG) +#if !defined (ACE_NLOGGING) time_t t = ACE_OS::time (0); -#endif /* ! ACE_NDEBUG */ +#endif /* ! ACE_NLOGGING */ if (ACE::debug ()) ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("beginning reconfiguration at %s"), diff --git a/ace/Service_Manager.cpp b/ace/Service_Manager.cpp index 992770d25cb..5fa21efae46 100644 --- a/ace/Service_Manager.cpp +++ b/ace/Service_Manager.cpp @@ -145,9 +145,9 @@ ACE_Service_Manager::get_handle (void) const int ACE_Service_Manager::handle_signal (int sig, siginfo_t *, ucontext_t *) { -#if defined (ACE_NDEBUG) +#if defined (ACE_NLOGGING) ACE_UNUSED_ARG (sig); -#endif /* ACE_NDEBUG */ +#endif /* ACE_NLOGGING */ ACE_TRACE ("ACE_Service_Manager::handle_signal"); if (this->debug_) diff --git a/ace/Svc_Conf.y b/ace/Svc_Conf.y index d7a279025c9..3db61bf08e8 100644 --- a/ace/Svc_Conf.y +++ b/ace/Svc_Conf.y @@ -310,9 +310,9 @@ pathname void yyerror (const char *s) { -#if defined (ACE_NDEBUG) +#if defined (ACE_NLOGGING) ACE_UNUSED_ARG (s); -#endif /* ACE_NDEBUG */ +#endif /* ACE_NLOGGING */ ACE_ERROR ((LM_ERROR, ASYS_TEXT ("[error %d] on line %d: %s\n"), diff --git a/ace/Svc_Conf_y.cpp b/ace/Svc_Conf_y.cpp index 15b85b2ca8d..6b26098a479 100644 --- a/ace/Svc_Conf_y.cpp +++ b/ace/Svc_Conf_y.cpp @@ -256,9 +256,9 @@ ACE_YYSTYPE ace_yyvs[ACE_YYSTACKSIZE]; void ace_yyerror (const char *s) { -#if defined (ACE_NDEBUG) +#if defined (ACE_NLOGGING) ACE_UNUSED_ARG (s); -#endif /* ACE_NDEBUG */ +#endif /* ACE_NLOGGING */ ACE_ERROR ((LM_ERROR, ASYS_TEXT ("[error %d] on line %d: %s\n"), diff --git a/ace/Time_Request_Reply.cpp b/ace/Time_Request_Reply.cpp index 3be25049437..338f3bf909f 100644 --- a/ace/Time_Request_Reply.cpp +++ b/ace/Time_Request_Reply.cpp @@ -176,9 +176,9 @@ ACE_Time_Request::dump (void) const ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("blocking forever\n"))); else { -#if !defined (ACE_NDEBUG) +#if !defined (ACE_NLOGGING) ACE_Time_Value tv = this->timeout (); -#endif /* ! ACE_NDEBUG */ +#endif /* ! ACE_NLOGGING */ ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("waiting for %ld secs and %ld usecs\n"), tv.sec (), tv.usec ())); } diff --git a/ace/Trace.cpp b/ace/Trace.cpp index 16f8c9af79c..8740dbd7c63 100644 --- a/ace/Trace.cpp +++ b/ace/Trace.cpp @@ -84,10 +84,10 @@ ACE_Trace::ACE_Trace (const ASYS_TCHAR *n, int line, const ASYS_TCHAR *file) { -#if defined (ACE_NDEBUG) +#if defined (ACE_NLOGGING) ACE_UNUSED_ARG (line); ACE_UNUSED_ARG (file); -#endif /* ACE_NDEBUG */ +#endif /* ACE_NLOGGING */ this->name_ = n; |