diff options
-rw-r--r-- | ACE/ACEXML/common/HttpCharStream.cpp | 3 | ||||
-rw-r--r-- | ACE/ACEXML/common/HttpCharStream.h | 1 | ||||
-rw-r--r-- | ACE/ACEXML/common/URL_Addr.cpp | 2 | ||||
-rw-r--r-- | ACE/ACEXML/common/XML_Codecs.cpp | 2 | ||||
-rw-r--r-- | ACE/Kokyu/Default_Dispatcher_Impl.cpp | 6 | ||||
-rw-r--r-- | ACE/Kokyu/Kokyu.cpp | 5 | ||||
-rw-r--r-- | ACE/ace/Asynch_IO.h | 3 | ||||
-rw-r--r-- | ACE/ace/Local_Memory_Pool.cpp | 3 | ||||
-rw-r--r-- | ACE/ace/Parse_Node.h | 1 | ||||
-rw-r--r-- | ACE/ace/Proactor.cpp | 2 | ||||
-rw-r--r-- | ACE/ace/Thread_Manager.cpp | 1 | ||||
-rw-r--r-- | ACE/tests/Priority_Reactor_Test.cpp | 2 | ||||
-rw-r--r-- | TAO/tao/Stub.h | 2 | ||||
-rw-r--r-- | TAO/tao/Stub.inl | 8 |
14 files changed, 6 insertions, 35 deletions
diff --git a/ACE/ACEXML/common/HttpCharStream.cpp b/ACE/ACEXML/common/HttpCharStream.cpp index 34550f04890..804f467a5fd 100644 --- a/ACE/ACEXML/common/HttpCharStream.cpp +++ b/ACE/ACEXML/common/HttpCharStream.cpp @@ -8,8 +8,6 @@ #include "ACEXML/common/HttpCharStream.h" #include "ACEXML/common/Encoding.h" - - /* Header FSM states. */ static const int HDST_LINE1_PROTOCOL = 0; static const int HDST_LINE1_WHITESPACE = 1; @@ -30,7 +28,6 @@ ACEXML_HttpCharStream::ACEXML_HttpCharStream (void) data_offset_ (0), encoding_ (0) { - } ACEXML_HttpCharStream::~ACEXML_HttpCharStream (void) diff --git a/ACE/ACEXML/common/HttpCharStream.h b/ACE/ACEXML/common/HttpCharStream.h index 932c9b44efc..a19b2d3b99f 100644 --- a/ACE/ACEXML/common/HttpCharStream.h +++ b/ACE/ACEXML/common/HttpCharStream.h @@ -129,7 +129,6 @@ private: ACE_OFF_T data_offset_; ACEXML_Char* encoding_; - }; diff --git a/ACE/ACEXML/common/URL_Addr.cpp b/ACE/ACEXML/common/URL_Addr.cpp index 9a5e4e1ab65..673b4317956 100644 --- a/ACE/ACEXML/common/URL_Addr.cpp +++ b/ACE/ACEXML/common/URL_Addr.cpp @@ -1,7 +1,5 @@ #include "ACEXML/common/URL_Addr.h" - - #if !defined (__ACEXML_INLINE__) #include "ACEXML/common/URL_Addr.inl" #endif /* __ACEXML_INLINE__ */ diff --git a/ACE/ACEXML/common/XML_Codecs.cpp b/ACE/ACEXML/common/XML_Codecs.cpp index a8de7147b5b..3e3860776e5 100644 --- a/ACE/ACEXML/common/XML_Codecs.cpp +++ b/ACE/ACEXML/common/XML_Codecs.cpp @@ -5,8 +5,6 @@ #include "ace/OS_NS_string.h" #include "ACEXML/common/XML_Codecs.h" - - ACEXML_Char* ACEXML_Base64::encode (const ACEXML_Char* input, size_t* output_len) diff --git a/ACE/Kokyu/Default_Dispatcher_Impl.cpp b/ACE/Kokyu/Default_Dispatcher_Impl.cpp index c5f067fb878..7780e2df68e 100644 --- a/ACE/Kokyu/Default_Dispatcher_Impl.cpp +++ b/ACE/Kokyu/Default_Dispatcher_Impl.cpp @@ -31,7 +31,7 @@ Default_Dispatcher_Impl::init_i (const Dispatcher_Attributes& attrs) this->ntasks_ = size; - Dispatcher_Task_Auto_Ptr * tasks_array=0; + Dispatcher_Task_Auto_Ptr * tasks_array = 0; ACE_NEW_RETURN (tasks_array, Dispatcher_Task_Auto_Ptr[ntasks_], -1); //ACE_DEBUG ((LM_DEBUG, "after new on task array\n" )); @@ -55,10 +55,6 @@ Default_Dispatcher_Impl::init_i (const Dispatcher_Attributes& attrs) -1); std::unique_ptr<Dispatcher_Task> tmp_task_auto_ptr (task); tasks_[i++] = std::move(tmp_task_auto_ptr); - //I couldn't use reset because MSVC6 auto_ptr does not have reset method. - //So in configurations where the auto_ptr maps to the std::auto_ptr instead - //of ACE auto_ptr, this would be a problem. - //tasks_[i++].reset (task); } this->thr_creation_flags_ = attrs.thread_creation_flags (); diff --git a/ACE/Kokyu/Kokyu.cpp b/ACE/Kokyu/Kokyu.cpp index 1f89b5f712b..ac396f9dea6 100644 --- a/ACE/Kokyu/Kokyu.cpp +++ b/ACE/Kokyu/Kokyu.cpp @@ -30,11 +30,6 @@ void Dispatcher::implementation (Dispatcher_Impl* impl) { std::unique_ptr<Dispatcher_Impl> tmp_impl (impl); dispatcher_impl_ = std::move(tmp_impl); - - //I couldn't use reset because MSVC++ auto_ptr does not have reset method. - //So in configurations where the auto_ptr maps to the std::auto_ptr instead - //of ACE auto_ptr, this would be a problem. - //dispatcher_impl_.reset (impl); } Dispatcher* diff --git a/ACE/ace/Asynch_IO.h b/ACE/ace/Asynch_IO.h index 55e339e5f81..f31d5d0a42b 100644 --- a/ACE/ace/Asynch_IO.h +++ b/ACE/ace/Asynch_IO.h @@ -1657,8 +1657,7 @@ public: private: ACE_Handler *handler_; }; - typedef ACE_Refcounted_Auto_Ptr<Proxy, ACE_SYNCH_MUTEX> - Proxy_Ptr; + typedef ACE_Refcounted_Auto_Ptr<Proxy, ACE_SYNCH_MUTEX> Proxy_Ptr; Proxy_Ptr &proxy (void); diff --git a/ACE/ace/Local_Memory_Pool.cpp b/ACE/ace/Local_Memory_Pool.cpp index c4d3f360b5b..46a6bdbec1a 100644 --- a/ACE/ace/Local_Memory_Pool.cpp +++ b/ACE/ace/Local_Memory_Pool.cpp @@ -1,11 +1,8 @@ -// Local_Memory_Pool.cpp #include "ace/Local_Memory_Pool.h" #include "ace/Auto_Ptr.h" #include "ace/OS_Memory.h" #include "ace/Log_Category.h" - - ACE_BEGIN_VERSIONED_NAMESPACE_DECL ACE_ALLOC_HOOK_DEFINE(ACE_Local_Memory_Pool) diff --git a/ACE/ace/Parse_Node.h b/ACE/ace/Parse_Node.h index 41bf735bba6..7d282a38601 100644 --- a/ACE/ace/Parse_Node.h +++ b/ACE/ace/Parse_Node.h @@ -8,7 +8,6 @@ */ //============================================================================= - #ifndef ACE_PARSE_NODE_H #define ACE_PARSE_NODE_H diff --git a/ACE/ace/Proactor.cpp b/ACE/ace/Proactor.cpp index 0c09737d542..61b7b9debe7 100644 --- a/ACE/ace/Proactor.cpp +++ b/ACE/ace/Proactor.cpp @@ -4,7 +4,6 @@ // This only works on Win32 platforms and on Unix platforms with aio // calls. - #include "ace/Auto_Ptr.h" #include "ace/Proactor_Impl.h" #include "ace/Object_Manager.h" @@ -14,7 +13,6 @@ # include "ace/Service_Config.h" #endif /* !ACE_HAS_WINCE && !ACE_LACKS_ACE_SVCCONF */ - #include "ace/Task_T.h" #include "ace/Log_Category.h" #include "ace/Framework_Component.h" diff --git a/ACE/ace/Thread_Manager.cpp b/ACE/ace/Thread_Manager.cpp index 4b7042c1216..af2deb3ae6a 100644 --- a/ACE/ace/Thread_Manager.cpp +++ b/ACE/ace/Thread_Manager.cpp @@ -1707,7 +1707,6 @@ ACE_Thread_Manager::exit (ACE_THR_FUNC_RETURN status, bool do_thread_exit) } // Wait for all the threads to exit. - int ACE_Thread_Manager::wait (const ACE_Time_Value *timeout, bool abandon_detached_threads, diff --git a/ACE/tests/Priority_Reactor_Test.cpp b/ACE/tests/Priority_Reactor_Test.cpp index 0716cd080f4..b2a99ea8e0a 100644 --- a/ACE/tests/Priority_Reactor_Test.cpp +++ b/ACE/tests/Priority_Reactor_Test.cpp @@ -1,4 +1,3 @@ - //============================================================================= /** * @file Priority_Reactor_Test.cpp @@ -17,7 +16,6 @@ */ //============================================================================= - #include "test_config.h" #include "ace/Get_Opt.h" #include "ace/SOCK_Connector.h" diff --git a/TAO/tao/Stub.h b/TAO/tao/Stub.h index de3020ed58c..feaf10c6ce2 100644 --- a/TAO/tao/Stub.h +++ b/TAO/tao/Stub.h @@ -423,7 +423,7 @@ protected: class TAO_Export TAO_Stub_Auto_Ptr { public: - explicit TAO_Stub_Auto_Ptr (TAO_Stub *p = 0); + explicit TAO_Stub_Auto_Ptr (TAO_Stub *p = nullptr); TAO_Stub_Auto_Ptr (TAO_Stub_Auto_Ptr &ap); TAO_Stub_Auto_Ptr &operator= (TAO_Stub_Auto_Ptr &rhs); ~TAO_Stub_Auto_Ptr (); diff --git a/TAO/tao/Stub.inl b/TAO/tao/Stub.inl index dfc4a708bfc..b02fff98755 100644 --- a/TAO/tao/Stub.inl +++ b/TAO/tao/Stub.inl @@ -440,7 +440,7 @@ TAO_Stub_Auto_Ptr::release (void) { ACE_TRACE ("TAO_Stub_Auto_Ptr::release"); TAO_Stub *old = this->p_; - this->p_ = 0; + this->p_ = nullptr; return old; } @@ -448,7 +448,7 @@ ACE_INLINE void TAO_Stub_Auto_Ptr::reset (TAO_Stub *p) { ACE_TRACE ("TAO_Stub_Auto_Ptr::reset"); - if (this->get () != p && this->get () != 0) + if (this->get () != p && this->get () != nullptr) this->get ()->_decr_refcnt (); this->p_ = p; } @@ -482,12 +482,11 @@ ACE_INLINE TAO_Stub_Auto_Ptr::~TAO_Stub_Auto_Ptr (void) { ACE_TRACE ("TAO_Stub_Auto_Ptr::~TAO_Stub_Auto_Ptr"); - if (this->get() != 0) + if (this->get() != nullptr) this->get ()->_decr_refcnt (); } // Accessor methods to the underlying Stub Object - ACE_INLINE TAO_Stub & TAO_Stub_Auto_Ptr::operator *() const { @@ -496,5 +495,4 @@ TAO_Stub_Auto_Ptr::operator *() const return *this->get (); } - TAO_END_VERSIONED_NAMESPACE_DECL |