diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2022-01-17 11:57:46 +0100 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2022-01-17 11:57:46 +0100 |
commit | 27acd637ea341c104749d6b8369d67fc5448920d (patch) | |
tree | bdc11f34d0006f16f103c908fa62565cfcaca8bc | |
parent | 97daeea11d251609247a90379d61551e8627910a (diff) | |
download | ATCD-27acd637ea341c104749d6b8369d67fc5448920d.tar.gz |
Use doxygen/nullptr/bool
* ACE/ace/Log_Msg.cpp:
* ACE/ace/NT_Service.cpp:
* ACE/ace/Object_Manager.cpp:
* ACE/ace/Object_Manager.h:
* ACE/ace/Thread.inl:
* ACE/tests/Task_Test.cpp:
* TAO/tao/DynamicInterface/Request.cpp:
* TAO/tao/GIOP_Message_Base.cpp:
* TAO/tao/Messaging/AMH_Response_Handler.cpp:
-rw-r--r-- | ACE/ace/Log_Msg.cpp | 2 | ||||
-rw-r--r-- | ACE/ace/NT_Service.cpp | 9 | ||||
-rw-r--r-- | ACE/ace/Object_Manager.cpp | 4 | ||||
-rw-r--r-- | ACE/ace/Object_Manager.h | 4 | ||||
-rw-r--r-- | ACE/ace/Thread.inl | 20 | ||||
-rw-r--r-- | ACE/tests/Task_Test.cpp | 3 | ||||
-rw-r--r-- | TAO/tao/DynamicInterface/Request.cpp | 2 | ||||
-rw-r--r-- | TAO/tao/GIOP_Message_Base.cpp | 2 | ||||
-rw-r--r-- | TAO/tao/Messaging/AMH_Response_Handler.cpp | 10 |
9 files changed, 23 insertions, 33 deletions
diff --git a/ACE/ace/Log_Msg.cpp b/ACE/ace/Log_Msg.cpp index b7b4aad6065..e186b82760a 100644 --- a/ACE/ace/Log_Msg.cpp +++ b/ACE/ace/Log_Msg.cpp @@ -3245,7 +3245,7 @@ ACE_Log_Msg::inherit_hook (ACE_OS_Thread_Descriptor *thr_desc, #if !defined (ACE_THREADS_DONT_INHERIT_LOG_MSG) && \ !defined (ACE_HAS_MINIMAL_ACE_OS) // Inherit the logging features if the parent thread has an - // <ACE_Log_Msg>. Note that all of the following operations occur + // ACE_Log_Msg. Note that all of the following operations occur // within thread-specific storage. ACE_Log_Msg *new_log = ACE_LOG_MSG; diff --git a/ACE/ace/NT_Service.cpp b/ACE/ace/NT_Service.cpp index fd88af02bea..720ceefa9b3 100644 --- a/ACE/ace/NT_Service.cpp +++ b/ACE/ace/NT_Service.cpp @@ -79,12 +79,11 @@ ACE_NT_Service::open (void *args) } int -ACE_NT_Service::fini (void) +ACE_NT_Service::fini () { return this->report_status (SERVICE_STOPPED, 0); } - void ACE_NT_Service::handle_control (DWORD control_code) { @@ -306,22 +305,20 @@ ACE_NT_Service::startup (void) } - void -ACE_NT_Service::capture_log_msg_attributes (void) +ACE_NT_Service::capture_log_msg_attributes () { ACE_Log_Msg::init_hook (this->log_msg_attributes_); } void -ACE_NT_Service::inherit_log_msg_attributes (void) +ACE_NT_Service::inherit_log_msg_attributes () { // There's no thread descriptor involved with a NT-started // thread, so the first arg is 0. ACE_Log_Msg::inherit_hook (0, this->log_msg_attributes_); } - int ACE_NT_Service::start_svc (ACE_Time_Value *wait_time, DWORD *svc_state, diff --git a/ACE/ace/Object_Manager.cpp b/ACE/ace/Object_Manager.cpp index a079b2d467d..56edf6ec314 100644 --- a/ACE/ace/Object_Manager.cpp +++ b/ACE/ace/Object_Manager.cpp @@ -353,13 +353,13 @@ ACE_Object_Manager::init () #if defined (ACE_HAS_TSS_EMULATION) int -ACE_Object_Manager::init_tss (void) +ACE_Object_Manager::init_tss () { return ACE_Object_Manager::instance ()->init_tss_i (); } int -ACE_Object_Manager::init_tss_i (void) +ACE_Object_Manager::init_tss_i () { ACE_MT (ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, ace_mon, *instance_->internal_lock_, -1)); diff --git a/ACE/ace/Object_Manager.h b/ACE/ace/Object_Manager.h index 3f571874587..f4a7a48845b 100644 --- a/ACE/ace/Object_Manager.h +++ b/ACE/ace/Object_Manager.h @@ -246,8 +246,8 @@ public: static int at_exit (ACE_Cleanup *object, void *param = 0, const char* name = 0); #if defined (ACE_HAS_TSS_EMULATION) - static int init_tss (void); - int init_tss_i (void); + static int init_tss (); + int init_tss_i (); #endif /** diff --git a/ACE/ace/Thread.inl b/ACE/ace/Thread.inl index 3313bdc53f9..eee6530b2ad 100644 --- a/ACE/ace/Thread.inl +++ b/ACE/ace/Thread.inl @@ -3,10 +3,9 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -// Allocates a <keyp> that is used to identify data that is specific -// to each thread in the process. The key is global to all threads in -// the process. - +/// Allocates a @a keyp that is used to identify data that is specific +/// to each thread in the process. The key is global to all threads in +/// the process. ACE_INLINE int ACE_Thread::keycreate (ACE_thread_key_t *keyp, #if defined (ACE_HAS_THR_C_DEST) @@ -20,8 +19,7 @@ ACE_Thread::keycreate (ACE_thread_key_t *keyp, return ACE_OS::thr_keycreate (keyp, destructor); } -// Free up the key so that other threads can reuse it. - +/// Free up the key so that other threads can reuse it. ACE_INLINE int ACE_Thread::keyfree (ACE_thread_key_t key) { @@ -29,9 +27,8 @@ ACE_Thread::keyfree (ACE_thread_key_t key) return ACE_OS::thr_keyfree (key); } -// Bind value to the thread-specific data key, <key>, for the calling -// thread. - +/// Bind value to the thread-specific data key, @a key, for the calling +/// thread. ACE_INLINE int ACE_Thread::setspecific (ACE_thread_key_t key, void *value) { @@ -39,9 +36,8 @@ ACE_Thread::setspecific (ACE_thread_key_t key, void *value) return ACE_OS::thr_setspecific (key, value); } -// Stores the current value bound to <key> for the calling thread -// into the location pointed to by <valuep>. - +/// Stores the current value bound to @a key> for the calling thread +/// into the location pointed to by @a valuep. ACE_INLINE int ACE_Thread::getspecific (ACE_thread_key_t key, void **valuep) { diff --git a/ACE/tests/Task_Test.cpp b/ACE/tests/Task_Test.cpp index 29168a8a423..60310043fd4 100644 --- a/ACE/tests/Task_Test.cpp +++ b/ACE/tests/Task_Test.cpp @@ -12,13 +12,10 @@ */ //============================================================================= - #include "test_config.h" #include "ace/Task.h" #include "ace/Thread_Hook.h" - - #if defined (ACE_HAS_THREADS) #include "ace/Atomic_Op.h" #include "ace/Barrier.h" diff --git a/TAO/tao/DynamicInterface/Request.cpp b/TAO/tao/DynamicInterface/Request.cpp index 71e69be6eb1..25a4e17ce5e 100644 --- a/TAO/tao/DynamicInterface/Request.cpp +++ b/TAO/tao/DynamicInterface/Request.cpp @@ -161,7 +161,7 @@ CORBA::Request::invoke (void) } void -CORBA::Request::send_oneway (void) +CORBA::Request::send_oneway () { TAO::NamedValue_Argument _tao_retval (this->result_); diff --git a/TAO/tao/GIOP_Message_Base.cpp b/TAO/tao/GIOP_Message_Base.cpp index 9b42415725f..88e03b21856 100644 --- a/TAO/tao/GIOP_Message_Base.cpp +++ b/TAO/tao/GIOP_Message_Base.cpp @@ -1533,7 +1533,7 @@ TAO_GIOP_Message_Base::dump_msg (const char *label, // request/reply id. CORBA::ULong tmp = 0; - CORBA::ULong *id = &tmp; + CORBA::ULong *id = std::addressof(tmp); char *tmp_id = nullptr; if (ptr[TAO_GIOP_MESSAGE_TYPE_OFFSET] == GIOP::Request || diff --git a/TAO/tao/Messaging/AMH_Response_Handler.cpp b/TAO/tao/Messaging/AMH_Response_Handler.cpp index f1ab26afb16..63fbd04897f 100644 --- a/TAO/tao/Messaging/AMH_Response_Handler.cpp +++ b/TAO/tao/Messaging/AMH_Response_Handler.cpp @@ -20,12 +20,12 @@ TAO_AMH_Response_Handler::TAO_AMH_Response_Handler () : reply_status_ (GIOP::NO_EXCEPTION) , mesg_base_ (0) , request_id_ (0) - , response_expected_ (0) - , transport_ (0) - , orb_core_ (0) + , response_expected_ (false) + , transport_ (nullptr) + , orb_core_ (nullptr) , argument_flag_ (1) , rh_reply_status_ (TAO_RS_UNINITIALIZED) - , allocator_ (0) + , allocator_ (nullptr) { } @@ -38,7 +38,7 @@ TAO_AMH_Response_Handler::~TAO_AMH_Response_Handler () { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); - if (this->response_expected_ == 0) //oneway ? + if (!this->response_expected_) //oneway ? { return; } |