diff options
74 files changed, 45 insertions, 687 deletions
diff --git a/ACE/ACEXML/examples/SAXPrint/main.cpp b/ACE/ACEXML/examples/SAXPrint/main.cpp index a0264368c8a..6a5cdee2504 100644 --- a/ACE/ACEXML/examples/SAXPrint/main.cpp +++ b/ACE/ACEXML/examples/SAXPrint/main.cpp @@ -145,11 +145,7 @@ ACE_TMAIN (int argc, ACE_TCHAR *argv[]) ACEXML_SAXPrint_Handler (name), -1); -#if defined (ACE_HAS_CPP11) std::unique_ptr<ACEXML_DefaultHandler> cleanup_handler (handler); -#else - auto_ptr<ACEXML_DefaultHandler> cleanup_handler (handler); -#endif ACEXML_Parser parser; ACEXML_InputSource input (stm); diff --git a/ACE/ace/ARGV.h b/ACE/ace/ARGV.h index a0edd1c78d5..231056ee37b 100644 --- a/ACE/ace/ARGV.h +++ b/ACE/ace/ARGV.h @@ -55,11 +55,9 @@ public: */ ACE_ARGV_Queue_Entry_T (const ACE_ARGV_Queue_Entry_T<CHAR_TYPE> &entry); -#if defined (ACE_HAS_CPP11) ACE_ARGV_Queue_Entry_T (ACE_ARGV_Queue_Entry_T&&) = default; ACE_ARGV_Queue_Entry_T &operator = (const ACE_ARGV_Queue_Entry_T &) = default; ACE_ARGV_Queue_Entry_T &operator = (ACE_ARGV_Queue_Entry_T &&) = default; -#endif /* ACE_HAS_CPP11 */ /// We need this destructor to keep some compilers from complaining. /// It's just a no-op, however. diff --git a/ACE/ace/Basic_Types.h b/ACE/ace/Basic_Types.h index 67916f8dc06..5922845dce4 100644 --- a/ACE/ace/Basic_Types.h +++ b/ACE/ace/Basic_Types.h @@ -70,16 +70,14 @@ # include <inttypes.h> # endif -# if defined (ACE_HAS_CPP11) -# define ACE_HAS_INT8_T -# define ACE_HAS_UINT8_T -# define ACE_HAS_INT16_T -# define ACE_HAS_UINT16_T -# define ACE_HAS_INT32_T -# define ACE_HAS_UINT32_T -# define ACE_HAS_INT64_T -# define ACE_HAS_UINT64_T -# endif /* ACE_HAS_CPP11 */ +# define ACE_HAS_INT8_T +# define ACE_HAS_UINT8_T +# define ACE_HAS_INT16_T +# define ACE_HAS_UINT16_T +# define ACE_HAS_INT32_T +# define ACE_HAS_UINT32_T +# define ACE_HAS_INT64_T +# define ACE_HAS_UINT64_T #ifdef ACE_LACKS_INTPTR_T # include "ace/If_Then_Else.h" diff --git a/ACE/ace/Bound_Ptr.h b/ACE/ace/Bound_Ptr.h index 6626b97b3f4..d53b911c79c 100644 --- a/ACE/ace/Bound_Ptr.h +++ b/ACE/ace/Bound_Ptr.h @@ -20,10 +20,6 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -#if !defined (ACE_HAS_CPP11) -# include "ace/Auto_Ptr.h" -#endif /* !ACE_HAS_CPP11 */ - ACE_BEGIN_VERSIONED_NAMESPACE_DECL /** @@ -114,12 +110,6 @@ public: /// object \<p\> immediately. explicit ACE_Strong_Bound_Ptr (X *p = 0); -#if !defined (ACE_HAS_CPP11) - /// Constructor that initializes an ACE_Strong_Bound_Ptr by stealing - /// ownership of an object from an auto_ptr. - explicit ACE_Strong_Bound_Ptr (auto_ptr<X> p); -#endif /* !ACE_HAS_CPP11 */ - /// Copy constructor binds @c this and @a r to the same object. ACE_Strong_Bound_Ptr (const ACE_Strong_Bound_Ptr<X, ACE_LOCK> &r); @@ -216,13 +206,6 @@ public: /// underlying object. void reset (X *p = 0); -#if !defined (ACE_HAS_CPP11) - /// Resets the ACE_Strong_Bound_Ptr to refer to a different - /// underlying object, ownership of which is stolen from the - /// auto_ptr. - void reset (auto_ptr<X> p); -#endif /* !ACE_HAS_CPP11 */ - /// Allows us to check for NULL on all ACE_Strong_Bound_Ptr /// objects. bool null (void) const; diff --git a/ACE/ace/Bound_Ptr.inl b/ACE/ace/Bound_Ptr.inl index 826c9aa9898..ff9e6e338ed 100644 --- a/ACE/ace/Bound_Ptr.inl +++ b/ACE/ace/Bound_Ptr.inl @@ -146,15 +146,6 @@ ACE_Strong_Bound_Ptr<X, ACE_LOCK>::ACE_Strong_Bound_Ptr (X *p) { } -#if !defined (ACE_HAS_CPP11) -template <class X, class ACE_LOCK> inline -ACE_Strong_Bound_Ptr<X, ACE_LOCK>::ACE_Strong_Bound_Ptr (auto_ptr<X> p) - : counter_ (COUNTER::create_strong ()), - ptr_ (p.release()) -{ -} -#endif /* !ACE_HAS_CPP11 */ - template <class X, class ACE_LOCK> inline ACE_Strong_Bound_Ptr<X, ACE_LOCK>::ACE_Strong_Bound_Ptr (const ACE_Strong_Bound_Ptr<X, ACE_LOCK> &r) : counter_ (r.counter_), @@ -303,19 +294,6 @@ ACE_Strong_Bound_Ptr<X, ACE_LOCK>::reset (X *p) delete old_ptr; } -#if !defined (ACE_HAS_CPP11) -template<class X, class ACE_LOCK> inline void -ACE_Strong_Bound_Ptr<X, ACE_LOCK>::reset (auto_ptr<X> p) -{ - COUNTER *old_counter = this->counter_; - X_t *old_ptr = this->ptr_; - this->counter_ = COUNTER::create_strong (); - this->ptr_ = p.release (); - if (COUNTER::detach_strong (old_counter) == 0) - delete old_ptr; -} -#endif /* !ACE_HAS_CPP11 */ - template <class X, class ACE_LOCK> inline ACE_Weak_Bound_Ptr<X, ACE_LOCK>::ACE_Weak_Bound_Ptr (X *p) : counter_ (COUNTER::create_weak ()), diff --git a/ACE/ace/CDR_Stream.cpp b/ACE/ace/CDR_Stream.cpp index 32654aeddf8..3cb4169e532 100644 --- a/ACE/ace/CDR_Stream.cpp +++ b/ACE/ace/CDR_Stream.cpp @@ -1689,7 +1689,6 @@ ACE_InputCDR::read_wstring (ACE_CDR::WChar*& x) ACE_CDR::Boolean ACE_InputCDR::read_string (std::string& x) { -#if defined (ACE_HAS_CPP11) // @@ This is a slight violation of "Optimize for the common case", // i.e. normally the translator will be 0, but OTOH the code is // smaller and should be better for the cache ;-) ;-) @@ -1727,20 +1726,12 @@ ACE_InputCDR::read_string (std::string& x) this->good_bit_ = false; x.clear (); return false; -#else - ACE_CDR::Char *buf = 0; - ACE_CDR::Boolean const marshal_flag = this->read_string (buf); - x.assign (buf); - ACE::strdelete (buf); - return marshal_flag; -#endif } #if !defined(ACE_LACKS_STD_WSTRING) ACE_CDR::Boolean ACE_InputCDR::read_wstring (std::wstring& x) { -#if defined (ACE_HAS_CPP11) // @@ This is a slight violation of "Optimize for the common case", // i.e. normally the translator will be 0, but OTOH the code is // smaller and should be better for the cache ;-) ;-) @@ -1814,13 +1805,6 @@ ACE_InputCDR::read_wstring (std::wstring& x) this->good_bit_ = false; x.clear (); return false; -#else - ACE_CDR::WChar *buf = 0; - ACE_CDR::Boolean const marshal_flag = this->read_wstring (buf); - x.assign (buf); - ACE::strdelete (buf); - return marshal_flag; -#endif } #endif diff --git a/ACE/ace/Codeset_IBM1047.cpp b/ACE/ace/Codeset_IBM1047.cpp index edfd2bab4df..014a833ec1f 100644 --- a/ACE/ace/Codeset_IBM1047.cpp +++ b/ACE/ace/Codeset_IBM1047.cpp @@ -123,7 +123,6 @@ ACE_CDR::Boolean ACE_IBM1047_ISO8859::read_string (ACE_InputCDR& in, std::string & x) { -#if defined (ACE_HAS_CPP11) ACE_CDR::ULong len; in.read_ulong (len); @@ -150,9 +149,6 @@ ACE_IBM1047_ISO8859::read_string (ACE_InputCDR& in, x.clear (); return false; -#else - return this->ACE_Char_Codeset_Translator::read_string (in, x); -#endif } ACE_CDR::Boolean @@ -276,7 +272,6 @@ ACE_CDR::Boolean ACE_ISO8859_IBM1047::read_string (ACE_InputCDR& in, std::string & x) { -#if defined (ACE_HAS_CPP11) ACE_CDR::ULong len; in.read_ulong (len); @@ -303,9 +298,6 @@ ACE_ISO8859_IBM1047::read_string (ACE_InputCDR& in, x.clear (); return false; -#else - return this->ACE_Char_Codeset_Translator::read_string (in, x); -#endif } ACE_CDR::Boolean diff --git a/ACE/ace/Event_Handler.cpp b/ACE/ace/Event_Handler.cpp index 83d9ad49b1c..a4b525f509e 100644 --- a/ACE/ace/Event_Handler.cpp +++ b/ACE/ace/Event_Handler.cpp @@ -356,7 +356,6 @@ ACE_Event_Handler_var::reset (ACE_Event_Handler *p) *this = p; } -#if defined (ACE_HAS_CPP11) ACE_Event_Handler_var::operator bool() const { return this->ptr_ == nullptr ? false : true; @@ -374,7 +373,6 @@ ACE_Event_Handler_var::operator !=(std::nullptr_t) const return this->ptr_ == nullptr ? false : true; } -#endif /* ACE_HAS_CPP11 */ // --------------------------------------------------------------------- diff --git a/ACE/ace/Event_Handler.h b/ACE/ace/Event_Handler.h index 5b97b6457a1..2862649c578 100644 --- a/ACE/ace/Event_Handler.h +++ b/ACE/ace/Event_Handler.h @@ -343,22 +343,18 @@ public: /// Reset the handler. void reset (ACE_Event_Handler *p = 0); -#if defined (ACE_HAS_CPP11) /// Bool operator to check if the ACE_Event_Handler_var has a value explicit operator bool() const; /// Equality operator to compare with nullptr_t bool operator ==(std::nullptr_t) const; /// Not equal operator to compare with nullptr_t bool operator !=(std::nullptr_t) const; -#endif private: /// Handler. ACE_Event_Handler *ptr_; }; -#if defined ACE_HAS_CPP11 - /// Define that we can use in user code to check if this /// helper factory method is there #define ACE_HAS_ACE_MAKE_EVENT_HANDLER @@ -385,8 +381,6 @@ namespace ACE } } -#endif - /** * @class ACE_Notification_Buffer * diff --git a/ACE/ace/Global_Macros.h b/ACE/ace/Global_Macros.h index 1a291be072a..85e8c600f4e 100644 --- a/ACE/ace/Global_Macros.h +++ b/ACE/ace/Global_Macros.h @@ -65,24 +65,11 @@ # error ACE/TAO require C++11 compliance, please upgrade your compiler and/or fix the platform configuration for your environment #endif /* !ACE_HAS_CPP11 */ -# if defined (ACE_NEEDS_FUNC_DEFINITIONS) && !defined (ACE_HAS_CPP11) - // It just evaporated ;-) Not pleasant. -# define ACE_UNIMPLEMENTED_FUNC(f) -# else -# if defined (ACE_HAS_CPP11) -# define ACE_UNIMPLEMENTED_FUNC(f) f = delete; -# else -# define ACE_UNIMPLEMENTED_FUNC(f) f; -# endif -# endif /* ACE_NEEDS_FUNC_DEFINITIONS */ +#define ACE_UNIMPLEMENTED_FUNC(f) f = delete; // noexcept(false) specification to specify that the operation can // throw an exception -#if defined (ACE_HAS_CPP11) #define ACE_NOEXCEPT_FALSE noexcept(false) -#else -#define ACE_NOEXCEPT_FALSE -#endif // ---------------------------------------------------------------- diff --git a/ACE/ace/OS_NS_Thread.cpp b/ACE/ace/OS_NS_Thread.cpp index b7af169c91d..cc8361494ce 100644 --- a/ACE/ace/OS_NS_Thread.cpp +++ b/ACE/ace/OS_NS_Thread.cpp @@ -3600,11 +3600,7 @@ ACE_OS::thr_create (ACE_THR_FUNC func, else thread_args = thread_adapter; -#if defined (ACE_HAS_CPP11) std::unique_ptr <ACE_Base_Thread_Adapter> auto_thread_args; -#else - auto_ptr <ACE_Base_Thread_Adapter> auto_thread_args; -#endif /* ACE_HAS_CPP11 */ if (thread_adapter == 0) ACE_auto_ptr_reset (auto_thread_args, diff --git a/ACE/ace/Proactor.cpp b/ACE/ace/Proactor.cpp index 420379b359e..4b5033a3bf3 100644 --- a/ACE/ace/Proactor.cpp +++ b/ACE/ace/Proactor.cpp @@ -243,11 +243,7 @@ ACE_Proactor_Handle_Timeout_Upcall::timeout (ACE_Proactor_Timer_Queue &, ACE_TEXT ("create_asynch_timer failed")), -1); -#if defined (ACE_HAS_CPP11) std::unique_ptr<ACE_Asynch_Result_Impl> safe_asynch_timer (asynch_timer); -#else - auto_ptr<ACE_Asynch_Result_Impl> safe_asynch_timer (asynch_timer); -#endif /* ACE_HAS_CPP11 */ // Post a completion. if (-1 == safe_asynch_timer->post_completion diff --git a/ACE/ace/Process_Manager.h b/ACE/ace/Process_Manager.h index dbfd2b06808..721fdeae978 100644 --- a/ACE/ace/Process_Manager.h +++ b/ACE/ace/Process_Manager.h @@ -243,7 +243,7 @@ public: * @retval 0 on success; -1 on failure. */ int wait (const ACE_Time_Value &timeout = ACE_Time_Value::max_time); -#if defined (ACE_HAS_CPP11) + /// @sa wait template< class Rep, class Period > int wait (const std::chrono::duration<Rep, Period>& timeout) @@ -251,7 +251,6 @@ public: ACE_Time_Value const tv (timeout); return this->wait (tv); } -#endif /** * Wait up to @a timeout for a single specified process to terminate. @@ -269,7 +268,7 @@ public: pid_t wait (pid_t pid, const ACE_Time_Value &timeout, ACE_exitcode *status = 0); -#if defined (ACE_HAS_CPP11) + /// @sa wait template< class Rep, class Period > pid_t wait (pid_t pid, @@ -279,7 +278,6 @@ public: ACE_Time_Value const tv (timeout); return this->wait (pid, tv, status); } -#endif /** * Wait indefinitely for a single, specified process to terminate. diff --git a/ACE/ace/Reactor.h b/ACE/ace/Reactor.h index 6d7a9c998f0..77eb07ab93d 100644 --- a/ACE/ace/Reactor.h +++ b/ACE/ace/Reactor.h @@ -569,7 +569,7 @@ public: const ACE_Time_Value &delay, const ACE_Time_Value &interval = ACE_Time_Value::zero); -#if defined (ACE_HAS_CPP11) + template<class Rep1, class Period1, class Rep2 = int, class Period2 = std::ratio<1>> long schedule_timer (ACE_Event_Handler *event_handler, const void *arg, @@ -581,7 +581,7 @@ public: ACE_Time_Value const tv_interval (interval); return this->schedule_timer (event_handler, arg, tv_delay, tv_interval); } -#endif + /** * Reset recurring timer interval. * @@ -595,7 +595,7 @@ public: */ virtual int reset_timer_interval (long timer_id, const ACE_Time_Value &interval); -#if defined (ACE_HAS_CPP11) + template<class Rep, class Period> int reset_timer_interval (long timer_id, const std::chrono::duration<Rep, Period>& interval) @@ -603,7 +603,6 @@ public: ACE_Time_Value const tv_interval (interval); return this->reset_timer_interval (timer_id, tv_interval); } -#endif /** * Cancel timer. diff --git a/ACE/ace/Reactor_Timer_Interface.h b/ACE/ace/Reactor_Timer_Interface.h index 3000d93b1d0..150fd55fa67 100644 --- a/ACE/ace/Reactor_Timer_Interface.h +++ b/ACE/ace/Reactor_Timer_Interface.h @@ -38,7 +38,6 @@ public: const ACE_Time_Value &delay, const ACE_Time_Value &interval = ACE_Time_Value::zero) = 0; -#if defined (ACE_HAS_CPP11) template<class Rep1, class Period1, class Rep2 = int, class Period2 = std::ratio<1>> long schedule_timer (ACE_Event_Handler *event_handler, const void *arg, @@ -49,11 +48,10 @@ public: ACE_Time_Value const tv_interval (interval); return this->schedule_timer (event_handler, arg, tv_delay, tv_interval); } -#endif virtual int reset_timer_interval (long timer_id, const ACE_Time_Value &interval) = 0; -#if defined (ACE_HAS_CPP11) + template<class Rep, class Period> int reset_timer_interval (long timer_id, const std::chrono::duration<Rep, Period>& interval) @@ -61,7 +59,6 @@ public: ACE_Time_Value const tv_interval (interval); return this->reset_timer_interval (timer_id, tv_interval); } -#endif virtual int cancel_timer (long timer_id, const void **arg = 0, diff --git a/ACE/ace/Signal.h b/ACE/ace/Signal.h index 416722eb811..2a64168c1ce 100644 --- a/ACE/ace/Signal.h +++ b/ACE/ace/Signal.h @@ -152,12 +152,10 @@ public: sigset_t *sigmask = 0, int flags = 0); -#if defined (ACE_HAS_CPP11) ACE_Sig_Action (const ACE_Sig_Action&) = default; ACE_Sig_Action (ACE_Sig_Action&&) = default; ACE_Sig_Action& operator = (ACE_Sig_Action const &) = default; ACE_Sig_Action &operator = (ACE_Sig_Action&&) = default; -#endif /* ACE_HAS_CPP11 */ /// Default dtor. ~ACE_Sig_Action (void); diff --git a/ACE/ace/Thread_Manager.cpp b/ACE/ace/Thread_Manager.cpp index 0d6de7694ca..e43f5978bcd 100644 --- a/ACE/ace/Thread_Manager.cpp +++ b/ACE/ace/Thread_Manager.cpp @@ -588,11 +588,7 @@ ACE_Thread_Manager::spawn_i (ACE_THR_FUNC func, // Create a new thread running <func>. *Must* be called with the // <lock_> held... // Get a "new" Thread Descriptor from the freelist. -#if defined (ACE_HAS_CPP11) std::unique_ptr<ACE_Thread_Descriptor> new_thr_desc (this->thread_desc_freelist_.remove ()); -#else - auto_ptr<ACE_Thread_Descriptor> new_thr_desc (this->thread_desc_freelist_.remove ()); -#endif /* ACE_HAS_CPP11 */ // Reset thread descriptor status new_thr_desc->reset (this); @@ -619,11 +615,7 @@ ACE_Thread_Manager::spawn_i (ACE_THR_FUNC func, flags), -1); # endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */ -#if defined ACE_HAS_CPP11 std::unique_ptr <ACE_Base_Thread_Adapter> auto_thread_args (static_cast<ACE_Base_Thread_Adapter *> (thread_args)); -#else - auto_ptr <ACE_Base_Thread_Adapter> auto_thread_args (static_cast<ACE_Base_Thread_Adapter *> (thread_args)); -#endif ACE_TRACE ("ACE_Thread_Manager::spawn_i"); ACE_hthread_t thr_handle; @@ -1496,11 +1488,7 @@ ACE_Thread_Manager::join (ACE_thread_t tid, ACE_THR_FUNC_RETURN *status) { if (ACE_OS::thr_equal (biter.next ()->thr_id_, tid)) { -#if defined (ACE_HAS_CPP11) std::unique_ptr<ACE_Thread_Descriptor_Base> tdbl (biter.advance_and_remove (false)); -#else - auto_ptr<ACE_Thread_Descriptor_Base> tdbl (biter.advance_and_remove (false)); -#endif /* ACE_HAS_CPP11 */ ace_mon.release(); #ifndef ACE_LACKS_PTHREAD_JOIN if (ACE_Thread::join (tdbl->thr_handle_, status) == -1) diff --git a/ACE/ace/Time_Policy.h b/ACE/ace/Time_Policy.h index 29ffa7d4ab6..8302975be93 100644 --- a/ACE/ace/Time_Policy.h +++ b/ACE/ace/Time_Policy.h @@ -116,12 +116,10 @@ public: /// Set delegate void set_delegate (ACE_Dynamic_Time_Policy_Base const * delegate); -#if defined (ACE_HAS_CPP11) ACE_Delegating_Time_Policy (const ACE_Delegating_Time_Policy&) = default; ACE_Delegating_Time_Policy (ACE_Delegating_Time_Policy&&) = default; ACE_Delegating_Time_Policy& operator = (ACE_Delegating_Time_Policy const &) = default; ACE_Delegating_Time_Policy &operator = (ACE_Delegating_Time_Policy&&) = default; -#endif /* ACE_HAS_CPP11 */ /// Noop. Just here to satisfy backwards compatibility demands. void set_gettimeofday (ACE_Time_Value (*gettimeofday)(void)); diff --git a/ACE/ace/Time_Value.cpp b/ACE/ace/Time_Value.cpp index 77c151e135c..3ed61ccc4fc 100644 --- a/ACE/ace/Time_Value.cpp +++ b/ACE/ace/Time_Value.cpp @@ -19,10 +19,7 @@ #endif /* ACE_HAS_CPP98_IOSTREAMS */ #include <cstdlib> - -#ifdef ACE_HAS_CPP11 -# include <cmath> -#endif /* ACE_HAS_CPP11 */ +#include <cmath> ACE_BEGIN_VERSIONED_NAMESPACE_DECL @@ -324,11 +321,7 @@ ostream &operator<<(ostream &o, const ACE_Time_Value &v) { o << tv->tv_sec; if (tv->tv_usec) -#ifdef ACE_HAS_CPP11 o << '.' << std::setw (6) << std::labs (tv->tv_usec); -#else - o << '.' << std::setw (6) << ACE_STD_NAMESPACE::labs (tv->tv_usec); -#endif } else if (tv->tv_usec < 0) o << "-0." << std::setw (6) << - tv->tv_usec; diff --git a/ACE/ace/Time_Value.h b/ACE/ace/Time_Value.h index 4c295c7399c..af6a6225387 100644 --- a/ACE/ace/Time_Value.h +++ b/ACE/ace/Time_Value.h @@ -19,12 +19,9 @@ # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ -# include "ace/os_include/os_time.h" - -#if defined (ACE_HAS_CPP11) -# include <chrono> -# include "ace/Truncate.h" -#endif /* ACE_HAS_CPP11 */ +#include "ace/os_include/os_time.h" +#include <chrono> +#include "ace/Truncate.h" // Define some helpful constants. // Not type-safe, and signed. For backward compatibility. @@ -80,7 +77,6 @@ public: /// Construct the ACE_Time_Value object from a timespec_t. explicit ACE_Time_Value (const timespec_t &t); -#if defined (ACE_HAS_CPP11) ACE_Time_Value (const ACE_Time_Value&) = default; ACE_Time_Value (ACE_Time_Value&&) = default; @@ -90,7 +86,6 @@ public: { this->set (duration); } -#endif /* ACE_HAS_CPP11 */ /// Destructor virtual ~ACE_Time_Value (); @@ -121,7 +116,6 @@ public: void set (const FILETIME &ft); # endif /* ACE_WIN32 */ -#if defined (ACE_HAS_CPP11) /// Initializes the ACE_Time_Value object from a std::duration. template< class Rep, class Period > void set (const std::chrono::duration<Rep, Period>& duration) @@ -134,7 +128,6 @@ public: duration % std::chrono::seconds (1))}; this->set (s.count (), ACE_Utils::truncate_cast<suseconds_t>(usec.count ())); } -#endif /* ACE_HAS_CPP11 */ /// Converts from ACE_Time_Value format into milliseconds format. /** @@ -264,11 +257,9 @@ public: /// Add @a tv to this. ACE_Time_Value &operator += (time_t tv); -#if defined (ACE_HAS_CPP11) /// Assign @a tv to this ACE_Time_Value &operator = (const ACE_Time_Value &) = default; ACE_Time_Value &operator = (ACE_Time_Value &&) = default; -#endif /* ACE_HAS_CPP11 */ /// Assign @a tv to this ACE_Time_Value &operator = (time_t tv); @@ -279,7 +270,6 @@ public: /// Subtract @a tv to this. ACE_Time_Value &operator -= (time_t tv); -#if defined (ACE_HAS_CPP11) /// Add @a std::duration to this. template< class Rep, class Period > ACE_Time_Value &operator += (const std::chrono::duration<Rep, Period>& duration) @@ -309,8 +299,6 @@ public: this->normalize (); return *this; } -#endif /* ACE_HAS_CPP11 */ - /** \brief Multiply the time value by the @a d factor. @@ -478,10 +466,7 @@ extern ACE_Export ostream &operator<<( ostream &o, const ACE_Time_Value &v ); ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_HAS_CPP11) - // Additional chrono operators. - namespace std { namespace chrono @@ -536,8 +521,6 @@ namespace std } } -#endif /* ACE_HAS_CPP11 */ - #if defined (__ACE_INLINE__) #include "ace/Time_Value.inl" #endif /* __ACE_INLINE__ */ diff --git a/ACE/ace/Time_Value.inl b/ACE/ace/Time_Value.inl index 581e348657b..1c7fc2c44b8 100644 --- a/ACE/ace/Time_Value.inl +++ b/ACE/ace/Time_Value.inl @@ -397,10 +397,7 @@ operator - (const ACE_Time_Value &tv1, ACE_END_VERSIONED_NAMESPACE_DECL -#if defined (ACE_HAS_CPP11) - // Additional chrono streaming operators. - namespace std { namespace chrono @@ -552,5 +549,3 @@ namespace std } } } - -#endif /* ACE_HAS_CPP11 */ diff --git a/ACE/ace/WFMO_Reactor.cpp b/ACE/ace/WFMO_Reactor.cpp index 5f901b14108..9bd76af0c23 100644 --- a/ACE/ace/WFMO_Reactor.cpp +++ b/ACE/ace/WFMO_Reactor.cpp @@ -1384,11 +1384,7 @@ ACE_WFMO_Reactor::register_handler_i (ACE_HANDLE event_handle, long new_network_events = 0; bool delete_event = false; -#if defined (ACE_HAS_CPP11) std::unique_ptr <ACE_Auto_Event> event; -#else - auto_ptr <ACE_Auto_Event> event; -#endif /* ACE_HAS_CPP11 */ // Look up the repository to see if the <event_handler> is already // there. @@ -1405,15 +1401,8 @@ ACE_WFMO_Reactor::register_handler_i (ACE_HANDLE event_handle, // need to create one if (event_handle == ACE_INVALID_HANDLE) { -#if defined (ACE_HAS_CPP11) std::unique_ptr<ACE_Auto_Event> tmp (new ACE_Auto_Event); event = std::move(tmp); -#else - // Note: don't change this since some C++ compilers have - // <auto_ptr>s that don't work properly... - auto_ptr<ACE_Auto_Event> tmp (new ACE_Auto_Event); - event = tmp; -#endif /* ACE_HAS_CPP11 */ event_handle = event->handle (); delete_event = true; } diff --git a/ACE/ace/XML_Utils/XML_Helper.h b/ACE/ace/XML_Utils/XML_Helper.h index 001a575b947..9deeda5e94d 100644 --- a/ACE/ace/XML_Utils/XML_Helper.h +++ b/ACE/ace/XML_Utils/XML_Helper.h @@ -83,11 +83,7 @@ namespace XML private: bool initialized_; XERCES_CPP_NAMESPACE::DOMImplementation *impl_; -#if defined (ACE_HAS_CPP11) mutable std::unique_ptr<XERCES_CPP_NAMESPACE::XercesDOMParser> parser_; -#else - mutable std::auto_ptr<XERCES_CPP_NAMESPACE::XercesDOMParser> parser_; -#endif /* ACE_HAS_CPP11 */ Resolver *resolver_; bool release_resolver_; diff --git a/ACE/ace/XML_Utils/XSCRT/Elements.hpp b/ACE/ace/XML_Utils/XSCRT/Elements.hpp index 5395a2a930a..cb9cdec2d90 100644 --- a/ACE/ace/XML_Utils/XSCRT/Elements.hpp +++ b/ACE/ace/XML_Utils/XSCRT/Elements.hpp @@ -148,11 +148,7 @@ namespace XSCRT { if (map_.get () == 0) { -#if defined (ACE_HAS_CPP11) map_ = std::unique_ptr<Map_> (new Map_); -#else - map_ = std::auto_ptr<Map_> (new Map_); -#endif /* ACE_HAS_CPP11 */ } if (!map_->insert (std::pair<IdentityProvider const*, Type*> (&id, t)).second) @@ -266,11 +262,7 @@ namespace XSCRT std::map<IdentityProvider const*, Type*, IdentityComparator> Map_; -#if defined (ACE_HAS_CPP11) std::unique_ptr<Map_> map_; -#else - std::auto_ptr<Map_> map_; -#endif /* ACE_HAS_CPP11 */ }; // Fundamental types template. diff --git a/ACE/ace/config-macosx-lion.h b/ACE/ace/config-macosx-lion.h index bf03d4d264b..746374ea5c8 100644 --- a/ACE/ace/config-macosx-lion.h +++ b/ACE/ace/config-macosx-lion.h @@ -8,14 +8,6 @@ #endif /* __clang__ */ #if defined (__x86_64__) -// On 64 bit platforms, the "long" type is 64-bits. Override the -// default 32-bit platform-specific format specifiers appropriately. -# if ! defined (ACE_HAS_CPP11) -# define ACE_INT64_FORMAT_SPECIFIER_ASCII "%ld" -# define ACE_INT64_FORMAT_SPECIFIER "%ld" -# define ACE_UINT64_FORMAT_SPECIFIER_ASCII "%lu" -# define ACE_UINT64_FORMAT_SPECIFIER "%lu" -# endif /* ACE_HAS_CPP11 */ # define ACE_SSIZE_T_FORMAT_SPECIFIER_ASCII "%ld" # define ACE_SIZE_T_FORMAT_SPECIFIER_ASCII "%lu" #endif /* __x86_64__ */ diff --git a/ACE/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm b/ACE/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm index 635cd48bb7d..66faed32dd0 100644 --- a/ACE/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm +++ b/ACE/bin/MakeProjectCreator/modules/GNUACEProjectCreator.pm @@ -52,24 +52,6 @@ sub fill_value { return 'VPATH = .:' . $str . $self->crlf(); } } - elsif ($name eq 'tao') { - my($incs) = $self->get_assignment('includes'); - my($libs) = $self->get_assignment('libpaths'); - return ((defined $incs && $incs =~ /tao/i) || - (defined $libs && $libs =~ /tao/i)); - } - elsif ($name eq 'ciao') { - my($incs) = $self->get_assignment('includes'); - my($libs) = $self->get_assignment('libpaths'); - return ((defined $incs && $incs =~ /ciao/i) || - (defined $libs && $libs =~ /ciao/i)); - } - elsif ($name eq 'dance') { - my($incs) = $self->get_assignment('includes'); - my($libs) = $self->get_assignment('libpaths'); - return ((defined $incs && $incs =~ /DAnCE/i) || - (defined $libs && $libs =~ /DAnCE/i)); - } elsif ($name eq 'genins') { my $ins = ''; $self->get_install_info(sub { $ins .= '#' . $_[0] }); diff --git a/ACE/bin/MakeProjectCreator/templates/gnu.mpd b/ACE/bin/MakeProjectCreator/templates/gnu.mpd index 9c0d45c5f0d..4b70f754727 100644 --- a/ACE/bin/MakeProjectCreator/templates/gnu.mpd +++ b/ACE/bin/MakeProjectCreator/templates/gnu.mpd @@ -200,15 +200,6 @@ VSHDIR = <%targetoutdir%>.shobj/ include $(ACE_ROOT)/include/makeinclude/wrapper_macros.GNU <%marker(extension)%> -<%if(ciao)%> -include $(CIAO_ROOT)/rules.ciao.GNU -<%endif%> -<%if(dance)%> -include $(DANCE_ROOT)/rules.dance.GNU -<%endif%> -<%if(tao)%> -include $(TAO_ROOT)/rules.tao.GNU -<%endif%> <%if(version)%> GNUACE_PROJECT_VERSION = <%version%> @@ -570,6 +561,9 @@ export PATH := $(PATH):<%custom_type->libpath%>$(if $(ARCH),:<%cust <%foreach(custom_type->input_files)%> <%if(custom_type->input_file->output_files)%> GENERATED_DIRTY +=<%foreach(custom_type->input_file->output_files)%> <%if(flag_overrides(custom_type->input_file, gendir))%><%if(!compares(flag_overrides(custom_type->input_file, gendir),.))%><%flag_overrides(custom_type->input_file, gendir)%>/<%endif%><%basename(custom_type->input_file->output_file)%><%else%><%custom_type->input_file->output_file%><%endif%><%endfor%> +<%if(precious_files)%> +PRECIOUS_FILES +=<%foreach(precious_files)%><%foreach(custom_type->input_file->output_files)%><%if(contains(custom_type->input_file->output_file, precious_file))%> <%custom_type->input_file->output_file%><%endif%><%endfor%><%endfor%> +<%endif%> <%if(custom_type->input_file->non_source_output_files)%> OBJS_DEPEND_ON_GENERATED = 1 <%endif%> @@ -735,7 +729,7 @@ incremental_depend_idl:: realclean: clean ifneq ($(GENERATED_DIRTY),) - -$(RM) -r $(GENERATED_DIRTY) + -$(RM) -r $(filter-out $(PRECIOUS_FILES),$(GENERATED_DIRTY)) endif <%if(postclean)%> -<%eval(postclean)%> diff --git a/ACE/examples/APG/Active_Objects/AO.cpp b/ACE/examples/APG/Active_Objects/AO.cpp index 352075f1fca..857cb941725 100644 --- a/ACE/examples/APG/Active_Objects/AO.cpp +++ b/ACE/examples/APG/Active_Objects/AO.cpp @@ -92,11 +92,7 @@ public: while (1) { // Dequeue the next method object -#if defined (ACE_HAS_CPP11) std::unique_ptr<ACE_Method_Request> request (this->activation_queue_.dequeue ()); -#else - auto_ptr<ACE_Method_Request> request (this->activation_queue_.dequeue ()); -#endif /* ACE_HAS_CPP11 */ // Invoke the method request. if (request->call () == -1) diff --git a/ACE/examples/APG/Active_Objects/AO2.cpp b/ACE/examples/APG/Active_Objects/AO2.cpp index a0bc5594362..bd73fb10f7e 100644 --- a/ACE/examples/APG/Active_Objects/AO2.cpp +++ b/ACE/examples/APG/Active_Objects/AO2.cpp @@ -90,11 +90,7 @@ public: while (1) { // Dequeue the next method object -#if defined (ACE_HAS_CPP11) std::unique_ptr<ACE_Method_Request> request (this->activation_queue_.dequeue ()); -#else - auto_ptr<ACE_Method_Request> request (this->activation_queue_.dequeue ()); -#endif /* ACE_HAS_CPP11 */ // Invoke the method request. if (request->call () == -1) diff --git a/ACE/examples/APG/Naming/Name_Binding.h b/ACE/examples/APG/Naming/Name_Binding.h index e40c717383a..0c21cde49e3 100644 --- a/ACE/examples/APG/Naming/Name_Binding.h +++ b/ACE/examples/APG/Naming/Name_Binding.h @@ -53,11 +53,7 @@ private: char *type_; }; -#if defined ACE_HAS_CPP11 typedef std::unique_ptr<Name_Binding> Name_Binding_Ptr; -#else -typedef auto_ptr<Name_Binding> Name_Binding_Ptr; -#endif // Listing 1 #endif /* NAME_BINDING_H */ diff --git a/ACE/examples/APG/Reactor/HAStatus.cpp b/ACE/examples/APG/Reactor/HAStatus.cpp index c424fd86aec..f4d25a2e1dd 100644 --- a/ACE/examples/APG/Reactor/HAStatus.cpp +++ b/ACE/examples/APG/Reactor/HAStatus.cpp @@ -95,11 +95,7 @@ ClientAcceptor::handle_input (ACE_HANDLE) { ClientService *client = 0; ACE_NEW_RETURN (client, ClientService, -1); -#if defined ACE_HAS_CPP11 std::unique_ptr<ClientService> p (client); -#else - auto_ptr<ClientService> p (client); -#endif if (this->acceptor_.accept (client->peer ()) == -1) ACE_ERROR_RETURN ((LM_ERROR, diff --git a/ACE/examples/Threads/future1.cpp b/ACE/examples/Threads/future1.cpp index 96504624420..b80071185cb 100644 --- a/ACE/examples/Threads/future1.cpp +++ b/ACE/examples/Threads/future1.cpp @@ -218,11 +218,7 @@ Scheduler::svc (void) { // Dequeue the next method object (we use an auto pointer in // case an exception is thrown in the <call>). -#if defined (ACE_HAS_CPP11) std::unique_ptr<ACE_Method_Request> mo (this->activation_queue_.dequeue ()); -#else - auto_ptr<ACE_Method_Request> mo (this->activation_queue_.dequeue ()); -#endif /* ACE_HAS_CPP11 */ ACE_DEBUG ((LM_DEBUG, "(%t) calling method object\n")); // Call it. diff --git a/ACE/examples/Threads/future2.cpp b/ACE/examples/Threads/future2.cpp index d435a7f6318..20f66f10188 100644 --- a/ACE/examples/Threads/future2.cpp +++ b/ACE/examples/Threads/future2.cpp @@ -215,11 +215,7 @@ Scheduler::svc (void) { // Dequeue the next method object (we use an auto pointer in // case an exception is thrown in the <call>). -#if defined (ACE_HAS_CPP11) std::unique_ptr<ACE_Method_Request> mo (this->activation_queue_.dequeue ()); -#else - auto_ptr<ACE_Method_Request> mo (this->activation_queue_.dequeue ()); -#endif /* ACE_HAS_CPP11 */ ACE_DEBUG ((LM_DEBUG, " (%t) calling method object\n")); // Call it. @@ -273,11 +269,7 @@ Scheduler::name (void) { // This scheduler is inactive... so we execute the user // request right away... -#if defined (ACE_HAS_CPP11) std::unique_ptr<ACE_Method_Request> mo (new Method_Request_name (this, new_future)); -#else - auto_ptr<ACE_Method_Request> mo (new Method_Request_name (this, new_future)); -#endif /* ACE_HAS_CPP11 */ mo->call (); // Smart pointer destructor automatically deletes mo. @@ -302,13 +294,8 @@ Scheduler::work (u_long newparam, int newcount) if (this->thr_count () == 0) { -#if defined (ACE_HAS_CPP11) std::unique_ptr<ACE_Method_Request> mo (new Method_Request_work (this, newparam, newcount, new_future)); -#else - auto_ptr<ACE_Method_Request> mo - (new Method_Request_work (this, newparam, newcount, new_future)); -#endif /* ACE_HAS_CPP11 */ mo->call (); // Smart pointer destructor automatically deletes it. } diff --git a/ACE/netsvcs/lib/Client_Logging_Handler.cpp b/ACE/netsvcs/lib/Client_Logging_Handler.cpp index 20ff879b484..bbbb141a8bc 100644 --- a/ACE/netsvcs/lib/Client_Logging_Handler.cpp +++ b/ACE/netsvcs/lib/Client_Logging_Handler.cpp @@ -109,11 +109,7 @@ ACE_Client_Logging_Handler::handle_input (ACE_HANDLE handle) ACE_Message_Block (ACE_DEFAULT_CDR_BUFSIZE), -1); -#if defined (ACE_HAS_CPP11) std::unique_ptr <ACE_Message_Block> header (header_p); -#else - auto_ptr <ACE_Message_Block> header (header_p); -#endif /* ACE_HAS_CPP11 */ // Align the Message Block for a CDR stream ACE_CDR::mb_align (header.get ()); @@ -221,11 +217,7 @@ ACE_Client_Logging_Handler::handle_input (ACE_HANDLE handle) ACE_NEW_RETURN (payload_p, ACE_Message_Block (length), -1); -#if defined (ACE_HAS_CPP11) std::unique_ptr <ACE_Message_Block> payload (payload_p); -#else - auto_ptr <ACE_Message_Block> payload (payload_p); -#endif /* ACE_HAS_CPP11 */ // Ensure there's sufficient room for log record payload. ACE_CDR::grow (payload.get (), 8 + ACE_CDR::MAX_ALIGNMENT + length); diff --git a/ACE/netsvcs/lib/Server_Logging_Handler_T.cpp b/ACE/netsvcs/lib/Server_Logging_Handler_T.cpp index 5bc40c5ae3a..ab985a40324 100644 --- a/ACE/netsvcs/lib/Server_Logging_Handler_T.cpp +++ b/ACE/netsvcs/lib/Server_Logging_Handler_T.cpp @@ -65,11 +65,7 @@ ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::ha ACE_Message_Block (ACE_DEFAULT_CDR_BUFSIZE), -1); -#if defined (ACE_HAS_CPP11) std::unique_ptr <ACE_Message_Block> header (header_p); -#else - auto_ptr <ACE_Message_Block> header (header_p); -#endif /* ACE_HAS_CPP11 */ // Align the Message Block for a CDR stream ACE_CDR::mb_align (header.get ()); @@ -126,11 +122,7 @@ ACE_Server_Logging_Handler_T<ACE_PEER_STREAM_2, COUNTER, ACE_SYNCH_USE, LMR>::ha ACE_NEW_RETURN (payload_p, ACE_Message_Block (length), -1); -#if defined (ACE_HAS_CPP11) std::unique_ptr <ACE_Message_Block> payload (payload_p); -#else - auto_ptr <ACE_Message_Block> payload (payload_p); -#endif /* ACE_HAS_CPP11 */ // Ensure there's sufficient room for log record payload. ACE_CDR::grow (payload.get (), 8 + ACE_CDR::MAX_ALIGNMENT + length); diff --git a/ACE/tests/Bound_Ptr_Test.cpp b/ACE/tests/Bound_Ptr_Test.cpp index 9b663caafdb..d8cc576ddfa 100644 --- a/ACE/tests/Bound_Ptr_Test.cpp +++ b/ACE/tests/Bound_Ptr_Test.cpp @@ -459,13 +459,7 @@ run_main (int, ACE_TCHAR *[]) Printer ("I am printer 2"), -1); -#if !defined (ACE_HAS_CPP11) - // Ownership is transferred from the auto_ptr to the strong pointer. - auto_ptr<Printer> a (printer2); - Printer_var r (a); -#else Printer_var r (printer2); -#endif /* !ACE_HAS_CPP11 */ for (int i = 0; i < n_loops; i++) // Spawn off the methods, which run in a separate thread as diff --git a/ACE/tests/Bug_2540_Regression_Test.cpp b/ACE/tests/Bug_2540_Regression_Test.cpp index 5cfc8a53303..fc944ec04da 100644 --- a/ACE/tests/Bug_2540_Regression_Test.cpp +++ b/ACE/tests/Bug_2540_Regression_Test.cpp @@ -105,11 +105,7 @@ run_main (int, ACE_TCHAR *[]) // happen with ACE_WFMO_Reactor. ACE_Select_Reactor *impl_ptr = 0; ACE_NEW_RETURN (impl_ptr, ACE_Select_Reactor, -1); -#if defined (ACE_HAS_CPP11) std::unique_ptr<ACE_Select_Reactor> auto_impl (impl_ptr); -#else - auto_ptr<ACE_Select_Reactor> auto_impl (impl_ptr); -#endif ACE_Reactor reactor (impl_ptr); diff --git a/ACE/tests/Bug_2820_Regression_Test.cpp b/ACE/tests/Bug_2820_Regression_Test.cpp index 8ef8f3a6b20..945b0b2a25e 100644 --- a/ACE/tests/Bug_2820_Regression_Test.cpp +++ b/ACE/tests/Bug_2820_Regression_Test.cpp @@ -43,15 +43,9 @@ run_main (int, ACE_TCHAR *[]) int result = 0; -#if defined ACE_HAS_CPP11 std::unique_ptr<ACE_Reactor> reactor(new ACE_Reactor(new ACE_Select_Reactor, 1)); ACE_Event_Handler_var v = ACE::make_event_handler<Simple_Handler> (reactor.get()); -#else - auto_ptr<ACE_Reactor> reactor(new ACE_Reactor(new ACE_Select_Reactor, 1)); - ACE_Event_Handler_var v( - new Simple_Handler(reactor.get())); -#endif ACE_Event_Handler::Reference_Count pre_notify_count = v->add_reference(); diff --git a/ACE/tests/Chrono_Test.cpp b/ACE/tests/Chrono_Test.cpp index 6cde2a4a2d0..1c9e86c6857 100644 --- a/ACE/tests/Chrono_Test.cpp +++ b/ACE/tests/Chrono_Test.cpp @@ -18,8 +18,6 @@ #include "ace/OS_NS_unistd.h" #include "ace/Time_Value.h" -#if defined (ACE_HAS_CPP11) - #include "ace/Truncate.h" int @@ -579,18 +577,3 @@ run_main (int, ACE_TCHAR *[]) ACE_END_TEST; return errors; } - -#else - -int -run_main (int, ACE_TCHAR *[]) -{ - ACE_START_TEST (ACE_TEXT ("Chrono_Test")); - - ACE_ERROR ((LM_INFO, ACE_TEXT ("std::chrono is not supported on this platform\n"))); - - ACE_END_TEST; - return 0; -} - -#endif /* ACE_HAS_CPP11 */ diff --git a/ACE/tests/Compiler_Features_15_Test.cpp b/ACE/tests/Compiler_Features_15_Test.cpp index 6d09a395589..9f642e979a9 100644 --- a/ACE/tests/Compiler_Features_15_Test.cpp +++ b/ACE/tests/Compiler_Features_15_Test.cpp @@ -5,8 +5,6 @@ #include "test_config.h" -#if defined (ACE_HAS_CPP11) - class A { public: @@ -27,18 +25,3 @@ run_main (int, ACE_TCHAR *[]) return 0; } - -#else -int -run_main (int, ACE_TCHAR *[]) -{ - ACE_START_TEST (ACE_TEXT("Compiler_Features_15_Test")); - - ACE_DEBUG ((LM_INFO, - ACE_TEXT ("No C++11 support enabled\n"))); - - ACE_END_TEST; - return 0; -} - -#endif diff --git a/ACE/tests/Compiler_Features_16_Test.cpp b/ACE/tests/Compiler_Features_16_Test.cpp index b806b572929..b11ac999233 100644 --- a/ACE/tests/Compiler_Features_16_Test.cpp +++ b/ACE/tests/Compiler_Features_16_Test.cpp @@ -5,8 +5,6 @@ #include "test_config.h" -#if defined (ACE_HAS_CPP11) - #include <limits> #include <stdint.h> #include <ostream> @@ -51,18 +49,3 @@ run_main (int, ACE_TCHAR *[]) return 0; } - -#else -int -run_main (int, ACE_TCHAR *[]) -{ - ACE_START_TEST (ACE_TEXT("Compiler_Features_16_Test")); - - ACE_DEBUG ((LM_INFO, - ACE_TEXT ("No C++11 support enabled\n"))); - - ACE_END_TEST; - return 0; -} - -#endif diff --git a/ACE/tests/Compiler_Features_17_Test.cpp b/ACE/tests/Compiler_Features_17_Test.cpp index df1220be936..e7a5f726813 100644 --- a/ACE/tests/Compiler_Features_17_Test.cpp +++ b/ACE/tests/Compiler_Features_17_Test.cpp @@ -4,8 +4,6 @@ #include "test_config.h" -#if defined (ACE_HAS_CPP11) - #include <limits> #include <stdint.h> @@ -34,18 +32,3 @@ run_main (int, ACE_TCHAR *[]) return 0; } - -#else -int -run_main (int, ACE_TCHAR *[]) -{ - ACE_START_TEST (ACE_TEXT("Compiler_Features_17_Test")); - - ACE_DEBUG ((LM_INFO, - ACE_TEXT ("No C++11 support enabled\n"))); - - ACE_END_TEST; - return 0; -} - -#endif diff --git a/ACE/tests/Compiler_Features_18_Test.cpp b/ACE/tests/Compiler_Features_18_Test.cpp index 88ebdb2ab6a..2eecfeba50f 100644 --- a/ACE/tests/Compiler_Features_18_Test.cpp +++ b/ACE/tests/Compiler_Features_18_Test.cpp @@ -5,8 +5,6 @@ #include "test_config.h" -#if defined (ACE_HAS_CPP11) - #include <array> namespace Test { @@ -34,18 +32,3 @@ run_main (int, ACE_TCHAR *[]) return 0; } - -#else -int -run_main (int, ACE_TCHAR *[]) -{ - ACE_START_TEST (ACE_TEXT("Compiler_Features_18_Test")); - - ACE_DEBUG ((LM_INFO, - ACE_TEXT ("No C++11 support enabled\n"))); - - ACE_END_TEST; - return 0; -} - -#endif diff --git a/ACE/tests/Compiler_Features_19_Test.cpp b/ACE/tests/Compiler_Features_19_Test.cpp index 99e17b84fab..a3fcad2e364 100644 --- a/ACE/tests/Compiler_Features_19_Test.cpp +++ b/ACE/tests/Compiler_Features_19_Test.cpp @@ -5,8 +5,6 @@ #include "test_config.h" -#if defined (ACE_HAS_CPP11) - #include <string> #include <iostream> #include <cstdint> @@ -61,18 +59,3 @@ run_main (int, ACE_TCHAR *[]) return 0; } - -#else -int -run_main (int, ACE_TCHAR *[]) -{ - ACE_START_TEST (ACE_TEXT("Compiler_Features_19_Test")); - - ACE_DEBUG ((LM_INFO, - ACE_TEXT ("No C++11 support enabled\n"))); - - ACE_END_TEST; - return 0; -} - -#endif diff --git a/ACE/tests/Compiler_Features_20_DLL.h b/ACE/tests/Compiler_Features_20_DLL.h index dc6de763687..4dfc196d115 100644 --- a/ACE/tests/Compiler_Features_20_DLL.h +++ b/ACE/tests/Compiler_Features_20_DLL.h @@ -13,8 +13,6 @@ #include "test_config.h" -#if defined (ACE_HAS_CPP11) - #include "Compiler_Features_20_DLL_Export.h" class COMPILER_FEATURES_20_DLL_Export UtcT @@ -23,6 +21,4 @@ public: ~UtcT (void) = default; }; -#endif - #endif /* ACE_TESTS_COMPILER_FEATURES_20_DLL_H */ diff --git a/ACE/tests/Compiler_Features_21_Test.cpp b/ACE/tests/Compiler_Features_21_Test.cpp index c8ad796e3a7..2dbd9d05a76 100644 --- a/ACE/tests/Compiler_Features_21_Test.cpp +++ b/ACE/tests/Compiler_Features_21_Test.cpp @@ -5,8 +5,6 @@ #include "test_config.h" -#if defined (ACE_HAS_CPP11) - template<class _T1> struct A { @@ -41,18 +39,3 @@ run_main (int, ACE_TCHAR *[]) return retval; } - -#else -int -run_main (int, ACE_TCHAR *[]) -{ - ACE_START_TEST (ACE_TEXT("Compiler_Features_21_Test")); - - ACE_DEBUG ((LM_INFO, - ACE_TEXT ("No C++11 support enabled\n"))); - - ACE_END_TEST; - return 0; -} - -#endif diff --git a/ACE/tests/Compiler_Features_23_Test.cpp b/ACE/tests/Compiler_Features_23_Test.cpp index 688c0a37bd9..39fc0962ab9 100644 --- a/ACE/tests/Compiler_Features_23_Test.cpp +++ b/ACE/tests/Compiler_Features_23_Test.cpp @@ -5,8 +5,6 @@ #include "test_config.h" -#if defined (ACE_HAS_CPP11) - #include <array> #include <string> #include <cstdint> @@ -44,18 +42,3 @@ run_main (int, ACE_TCHAR *[]) return 0; } - -#else -int -run_main (int, ACE_TCHAR *[]) -{ - ACE_START_TEST (ACE_TEXT("Compiler_Features_23_Test")); - - ACE_DEBUG ((LM_INFO, - ACE_TEXT ("No C++11 support enabled\n"))); - - ACE_END_TEST; - return 0; -} - -#endif diff --git a/ACE/tests/Compiler_Features_24_Test.cpp b/ACE/tests/Compiler_Features_24_Test.cpp index d4d0697ed26..c62aac7241d 100644 --- a/ACE/tests/Compiler_Features_24_Test.cpp +++ b/ACE/tests/Compiler_Features_24_Test.cpp @@ -5,8 +5,6 @@ #include "test_config.h" -#if defined (ACE_HAS_CPP11) - #include <type_traits> #include <memory> @@ -92,18 +90,3 @@ run_main (int, ACE_TCHAR *[]) return 0; #endif } - -#else -int -run_main (int, ACE_TCHAR *[]) -{ - ACE_START_TEST (ACE_TEXT("Compiler_Features_24_Test")); - - ACE_DEBUG ((LM_INFO, - ACE_TEXT ("No C++11 support enabled\n"))); - - ACE_END_TEST; - return 0; -} - -#endif diff --git a/ACE/tests/Compiler_Features_25_Test.cpp b/ACE/tests/Compiler_Features_25_Test.cpp index fd3e13c49e0..9a77979adff 100644 --- a/ACE/tests/Compiler_Features_25_Test.cpp +++ b/ACE/tests/Compiler_Features_25_Test.cpp @@ -5,8 +5,6 @@ #include "test_config.h" -#if defined (ACE_HAS_CPP11) - #include <type_traits> struct Foo @@ -36,18 +34,3 @@ run_main (int, ACE_TCHAR *[]) return retval; } - -#else -int -run_main (int, ACE_TCHAR *[]) -{ - ACE_START_TEST (ACE_TEXT("Compiler_Features_25_Test")); - - ACE_DEBUG ((LM_INFO, - ACE_TEXT ("No C++11 support enabled\n"))); - - ACE_END_TEST; - return 0; -} - -#endif diff --git a/ACE/tests/Compiler_Features_26_Test.cpp b/ACE/tests/Compiler_Features_26_Test.cpp index e48b6709f40..46445558a23 100644 --- a/ACE/tests/Compiler_Features_26_Test.cpp +++ b/ACE/tests/Compiler_Features_26_Test.cpp @@ -5,8 +5,6 @@ #include "test_config.h" -#if defined (ACE_HAS_CPP11) - #include <memory> int @@ -74,18 +72,3 @@ run_main (int, ACE_TCHAR *[]) return retval; } - -#else -int -run_main (int, ACE_TCHAR *[]) -{ - ACE_START_TEST (ACE_TEXT("Compiler_Features_26_Test")); - - ACE_DEBUG ((LM_INFO, - ACE_TEXT ("No C++11 support enabled\n"))); - - ACE_END_TEST; - return 0; -} - -#endif diff --git a/ACE/tests/Compiler_Features_27_Test.cpp b/ACE/tests/Compiler_Features_27_Test.cpp index d8a58d0ee78..36781025044 100644 --- a/ACE/tests/Compiler_Features_27_Test.cpp +++ b/ACE/tests/Compiler_Features_27_Test.cpp @@ -5,8 +5,6 @@ #include "test_config.h" -#if defined (ACE_HAS_CPP11) - #include <string> class Foo @@ -34,18 +32,3 @@ run_main (int, ACE_TCHAR *[]) return 0; } - -#else -int -run_main (int, ACE_TCHAR *[]) -{ - ACE_START_TEST (ACE_TEXT("Compiler_Features_27_Test")); - - ACE_DEBUG ((LM_INFO, - ACE_TEXT ("No C++11 support enabled\n"))); - - ACE_END_TEST; - return 0; -} - -#endif diff --git a/ACE/tests/Compiler_Features_28_Test.cpp b/ACE/tests/Compiler_Features_28_Test.cpp index 4ec46119ebc..a31da3380f4 100644 --- a/ACE/tests/Compiler_Features_28_Test.cpp +++ b/ACE/tests/Compiler_Features_28_Test.cpp @@ -5,8 +5,6 @@ #include "test_config.h" -#if defined (ACE_HAS_CPP11) - #include <cstdint> enum class OPERATIONS @@ -43,18 +41,3 @@ run_main (int, ACE_TCHAR *[]) return 0; } - -#else -int -run_main (int, ACE_TCHAR *[]) -{ - ACE_START_TEST (ACE_TEXT("Compiler_Features_28_Test")); - - ACE_DEBUG ((LM_INFO, - ACE_TEXT ("No C++11 support enabled\n"))); - - ACE_END_TEST; - return 0; -} - -#endif diff --git a/ACE/tests/Compiler_Features_29_Test.cpp b/ACE/tests/Compiler_Features_29_Test.cpp index a74d2bcd212..9ff037ee2de 100644 --- a/ACE/tests/Compiler_Features_29_Test.cpp +++ b/ACE/tests/Compiler_Features_29_Test.cpp @@ -5,8 +5,6 @@ #include "test_config.h" -#if defined (ACE_HAS_CPP11) - #include <cstdint> class A @@ -27,18 +25,3 @@ run_main (int, ACE_TCHAR *[]) return 0; } - -#else -int -run_main (int, ACE_TCHAR *[]) -{ - ACE_START_TEST (ACE_TEXT("Compiler_Features_29_Test")); - - ACE_DEBUG ((LM_INFO, - ACE_TEXT ("No C++11 support enabled\n"))); - - ACE_END_TEST; - return 0; -} - -#endif diff --git a/ACE/tests/Compiler_Features_31_Test.cpp b/ACE/tests/Compiler_Features_31_Test.cpp index e3202977d57..349ebca71d5 100644 --- a/ACE/tests/Compiler_Features_31_Test.cpp +++ b/ACE/tests/Compiler_Features_31_Test.cpp @@ -5,8 +5,6 @@ #include "test_config.h" -#if defined (ACE_HAS_CPP11) - namespace A { namespace C @@ -56,18 +54,3 @@ run_main (int, ACE_TCHAR *[]) return 0; } - -#else -int -run_main (int, ACE_TCHAR *[]) -{ - ACE_START_TEST (ACE_TEXT("Compiler_Features_31_Test")); - - ACE_DEBUG ((LM_INFO, - ACE_TEXT ("No C++11 support enabled\n"))); - - ACE_END_TEST; - return 0; -} - -#endif diff --git a/ACE/tests/Compiler_Features_32_Test.cpp b/ACE/tests/Compiler_Features_32_Test.cpp index 3d9bea1d882..cbba2e2cfe8 100644 --- a/ACE/tests/Compiler_Features_32_Test.cpp +++ b/ACE/tests/Compiler_Features_32_Test.cpp @@ -15,8 +15,6 @@ #include "test_config.h" -#if defined (ACE_HAS_CPP11) - #include <string> class A @@ -86,18 +84,3 @@ run_main (int, ACE_TCHAR *[]) return 0; } - -#else -int -run_main (int, ACE_TCHAR *[]) -{ - ACE_START_TEST (ACE_TEXT("Compiler_Features_32_Test")); - - ACE_DEBUG ((LM_INFO, - ACE_TEXT ("No C++11 support enabled\n"))); - - ACE_END_TEST; - return 0; -} - -#endif diff --git a/ACE/tests/Compiler_Features_34_Test.cpp b/ACE/tests/Compiler_Features_34_Test.cpp index 2e9629c04e1..ac398b4df77 100644 --- a/ACE/tests/Compiler_Features_34_Test.cpp +++ b/ACE/tests/Compiler_Features_34_Test.cpp @@ -5,8 +5,6 @@ #include "test_config.h" -#if defined (ACE_HAS_CPP11) - class B { public: @@ -29,18 +27,3 @@ run_main (int, ACE_TCHAR *[]) return 0; } - -#else -int -run_main (int, ACE_TCHAR *[]) -{ - ACE_START_TEST (ACE_TEXT("Compiler_Features_34_Test")); - - ACE_DEBUG ((LM_INFO, - ACE_TEXT ("No C++11 support enabled\n"))); - - ACE_END_TEST; - return 0; -} - -#endif diff --git a/ACE/tests/Compiler_Features_35_Test.cpp b/ACE/tests/Compiler_Features_35_Test.cpp index 490f2bf208d..3193b57dfd3 100644 --- a/ACE/tests/Compiler_Features_35_Test.cpp +++ b/ACE/tests/Compiler_Features_35_Test.cpp @@ -5,8 +5,6 @@ #include "test_config.h" -#if defined (ACE_HAS_CPP11) - #include <memory> class foo_impl; @@ -41,18 +39,3 @@ run_main (int, ACE_TCHAR *[]) return 0; } - -#else -int -run_main (int, ACE_TCHAR *[]) -{ - ACE_START_TEST (ACE_TEXT("Compiler_Features_35_Test")); - - ACE_DEBUG ((LM_INFO, - ACE_TEXT ("No C++11 support enabled\n"))); - - ACE_END_TEST; - return 0; -} - -#endif diff --git a/ACE/tests/Compiler_Features_36_Test.cpp b/ACE/tests/Compiler_Features_36_Test.cpp index 7b9096e0bd4..4e82062b646 100644 --- a/ACE/tests/Compiler_Features_36_Test.cpp +++ b/ACE/tests/Compiler_Features_36_Test.cpp @@ -5,8 +5,6 @@ #include "test_config.h" -#if defined (ACE_HAS_CPP11) - #include <type_traits> template <typename T> @@ -30,18 +28,3 @@ run_main (int, ACE_TCHAR *[]) return 0; } - -#else -int -run_main (int, ACE_TCHAR *[]) -{ - ACE_START_TEST (ACE_TEXT("Compiler_Features_36_Test")); - - ACE_DEBUG ((LM_INFO, - ACE_TEXT ("No C++11 support enabled\n"))); - - ACE_END_TEST; - return 0; -} - -#endif diff --git a/ACE/tests/DLL_Test.cpp b/ACE/tests/DLL_Test.cpp index 7b8a39f1f37..e3f02ed8429 100644 --- a/ACE/tests/DLL_Test.cpp +++ b/ACE/tests/DLL_Test.cpp @@ -93,11 +93,7 @@ int basic_test (ACE_DLL &dll) dll.error ()), -1); -#if defined ACE_HAS_CPP11 std::unique_ptr<Hello> my_hello (factory ()); -#else - auto_ptr<Hello> my_hello (factory ()); -#endif // Make the method calls, as the object pointer is available. my_hello->say_hello (); diff --git a/ACE/tests/Process_Manager_Test.cpp b/ACE/tests/Process_Manager_Test.cpp index d08152588d6..109019e9b12 100644 --- a/ACE/tests/Process_Manager_Test.cpp +++ b/ACE/tests/Process_Manager_Test.cpp @@ -446,11 +446,7 @@ run_main (int argc, ACE_TCHAR *argv[]) mgr, 1, 4); -#if defined (ACE_HAS_CPP11) result = mgr.wait (0, std::chrono::seconds (4), &exitcode); -#else - result = mgr.wait (0, ACE_Time_Value (4), &exitcode); -#endif if (result != child4) { diff --git a/ACE/tests/Reactor_Remove_Resume_Test.cpp b/ACE/tests/Reactor_Remove_Resume_Test.cpp index 40a2334f103..ff2bd3898ad 100644 --- a/ACE/tests/Reactor_Remove_Resume_Test.cpp +++ b/ACE/tests/Reactor_Remove_Resume_Test.cpp @@ -461,7 +461,6 @@ run_main (int, ACE_TCHAR *[]) ACE_ERROR ((LM_INFO, ACE_TEXT ("Test passed.\n"))); -#if defined (ACE_HAS_CPP11) ACE_Event_Handler_var nullvar; if (!nullvar) { @@ -496,7 +495,6 @@ run_main (int, ACE_TCHAR *[]) ACE_TEXT ("EH_var explicit operator!= nullptr FAILED\n"))); ++overall_result; } -#endif ACE_END_TEST; diff --git a/ACE/tests/Reactor_Timer_Test.cpp b/ACE/tests/Reactor_Timer_Test.cpp index 90d2f522bef..a3c2a3def0c 100644 --- a/ACE/tests/Reactor_Timer_Test.cpp +++ b/ACE/tests/Reactor_Timer_Test.cpp @@ -95,13 +95,8 @@ Time_Handler::handle_timeout (const ACE_Time_Value &tv, } else if (current_count == -1) { -#if defined (ACE_HAS_CPP11) int result = ACE_Reactor::instance ()->reset_timer_interval (this->timer_id (), std::chrono::seconds {the_count + 1}); -#else - int result = ACE_Reactor::instance ()->reset_timer_interval (this->timer_id (), - ACE_Time_Value (the_count + 1)); -#endif if (result == -1) ACE_ERROR ((LM_ERROR, ACE_TEXT ("Error resetting timer interval\n"))); @@ -134,15 +129,9 @@ test_registering_all_handlers (void) for (size_t i = 0; i < ACE_MAX_TIMERS; i++) { t_id[i] = -#if defined (ACE_HAS_CPP11) ACE_Reactor::instance ()->schedule_timer (&rt[i], (const void *) i, std::chrono::seconds {2 * i + 1}); -#else - ACE_Reactor::instance ()->schedule_timer (&rt[i], - (const void *) i, - ACE_Time_Value (2 * i + 1)); -#endif ACE_TEST_ASSERT (t_id[i] != -1); rt[i].timer_id (t_id[i]); } diff --git a/ACE/tests/Task_Ex_Test.cpp b/ACE/tests/Task_Ex_Test.cpp index d9d141aaaa9..abe6e5b7bf9 100644 --- a/ACE/tests/Task_Ex_Test.cpp +++ b/ACE/tests/Task_Ex_Test.cpp @@ -67,11 +67,7 @@ int Consumer::svc () while(this->getq (pMsg)!=-1) { ACE_TEST_ASSERT (pMsg!=0); -#if defined (ACE_HAS_CPP11) std::unique_ptr<User_Defined_Msg> pAuto(pMsg); -#else - auto_ptr<User_Defined_Msg> pAuto(pMsg); -#endif /* ACE_HAS_CPP11 */ ACE_DEBUG((LM_DEBUG, ACE_TEXT("Consumer::svc got msg id=%d\n"), pMsg->msg_id ())); diff --git a/TAO/MPC/config/tao_rules.mpb b/TAO/MPC/config/tao_rules.mpb new file mode 100644 index 00000000000..e052c156cea --- /dev/null +++ b/TAO/MPC/config/tao_rules.mpb @@ -0,0 +1,5 @@ +project { + verbatim(gnuace, extension, 1) { + include $(TAO_ROOT)/rules.tao.GNU + } +} diff --git a/TAO/MPC/config/taodefaults.mpb b/TAO/MPC/config/taodefaults.mpb index 29fc8b6266e..89e08a6cee1 100644 --- a/TAO/MPC/config/taodefaults.mpb +++ b/TAO/MPC/config/taodefaults.mpb @@ -1,5 +1,5 @@ // -*- MPC -*- -project : tao_vc8warnings { +project : tao_rules, tao_vc8warnings { staticflags += TAO_AS_STATIC_LIBS includes += $(TAO_ROOT) libpaths += $(ACE_ROOT)/lib diff --git a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp index 07ae0b2d891..0b8538be6fe 100644 --- a/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp @@ -254,20 +254,16 @@ be_visitor_interface_ch::visit_interface (be_interface *node) if (! node->is_abstract ()) { *os << "// Private and unimplemented for concrete interfaces." << be_nl - << "ACE_UNIMPLEMENTED_FUNC (" << node->local_name () << " (const " - << node->local_name () << " &))" - << "\n#if defined (ACE_HAS_CPP11)" << be_nl - << "ACE_UNIMPLEMENTED_FUNC (" << node->local_name () << " (" - << node->local_name () << " &&))" - << "\n#endif /* ACE_HAS_CPP11 */" << be_nl; + << node->local_name () << " (const " + << node->local_name () << " &) = delete;" << be_nl + << node->local_name () << " (" + << node->local_name () << " &&) = delete;" << be_nl; } - *os << "ACE_UNIMPLEMENTED_FUNC (" << node->local_name () - << " &operator= (const " << node->local_name () << " &))" - << "\n#if defined (ACE_HAS_CPP11)" << be_nl - << "ACE_UNIMPLEMENTED_FUNC (" << node->local_name () - << " &operator= (" << node->local_name () << " &&))" - << "\n#endif /* ACE_HAS_CPP11 */" << be_uidt_nl + *os << node->local_name () + << " &operator= (const " << node->local_name () << " &) = delete;" << be_nl + << node->local_name () + << " &operator= (" << node->local_name () << " &&) = delete;" << be_uidt_nl << "};"; be_visitor_context ctx (*this->ctx_); diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp index ceb9f1e42d3..55d0a3693fd 100644 --- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp +++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp @@ -238,12 +238,12 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node) } // Default copy/move constructor and assignment operators - *os << "\n#if defined (ACE_HAS_CPP11)" << be_nl + *os << be_nl << node->local_name () << " (const " << node->local_name () << " &) = default;" << be_nl << node->local_name () << " (" << node->local_name () << " &&) = default;" << be_nl << node->local_name () << "& operator= (const " << node->local_name () << " &) = default;" << be_nl << node->local_name () << "& operator= (" << node->local_name () << " &&) = default;" - << "\n#endif /* ACE_HAS_CPP11 */" << be_nl; + << be_nl; *os << "virtual ~" << node->local_name () << " (void);"; diff --git a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp index 122540ac6b8..bf6630e78ad 100644 --- a/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp +++ b/TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp @@ -472,12 +472,8 @@ be_visitor_valuetype_cs::visit_operation (be_operation *node) // explicitly take care of both cases (platforms with // and without native exception support). *os << be_nl - << "{" - << "\n#if defined (ACE_HAS_CPP11)" << be_idt_nl - << "std::unique_ptr< ::CORBA::Exception> safety (this->exception);" - << "\n#else" << be_nl - << "auto_ptr< ::CORBA::Exception> safety (this->exception);" - << "\n#endif /* ACE_HAS_CPP11 */" << be_nl + << "{" << be_idt_nl + << "std::unique_ptr< ::CORBA::Exception> safety (this->exception);" << be_nl << "this->exception->_raise ();" << be_uidt_nl << "}" << be_nl; diff --git a/TAO/TAO_IDL/be_include/be_helper.h b/TAO/TAO_IDL/be_include/be_helper.h index eca14482979..3f6fef60936 100644 --- a/TAO/TAO_IDL/be_include/be_helper.h +++ b/TAO/TAO_IDL/be_include/be_helper.h @@ -17,10 +17,8 @@ #include "ace/CDR_Base.h" #include "ace/SString.h" -#if defined (ACE_HAS_CPP11) #include "ace/OS_NS_stdio.h" #include <type_traits> -#endif /* ACE_HAS_CPP11 */ class Identifier; class UTL_IdList; @@ -172,7 +170,6 @@ public: int gen_endif (void); // =overloaded operators -#if defined (ACE_HAS_CPP11) // Avoid duplication for the underlying type of size_t template <typename Dummy = TAO_OutStream &> typename std::enable_if<std::is_same<Dummy, TAO_OutStream &>::value && @@ -187,7 +184,6 @@ public: return *this; } -#endif /* ACE_HAS_CPP11 */ TAO_OutStream &operator<< (const char *str); TAO_OutStream &operator<< (const ACE_CString &str); diff --git a/TAO/TAO_IDL/tao_idl.mpc b/TAO/TAO_IDL/tao_idl.mpc index 475529bdb6a..bc922467772 100644 --- a/TAO/TAO_IDL/tao_idl.mpc +++ b/TAO/TAO_IDL/tao_idl.mpc @@ -1,5 +1,5 @@ // -*- MPC -*-cr -project(TAO_IDL_EXE) : aceexe, install, tao_output, tao_idl_fe { +project(TAO_IDL_EXE) : aceexe, install, tao_rules, tao_output, tao_idl_fe { exename = tao_idl exeout = $(ACE_ROOT)/bin after += TAO_IDL_BE gperf diff --git a/TAO/TAO_IDL/tao_idl_be.mpc b/TAO/TAO_IDL/tao_idl_be.mpc index a121b594e73..427916eb512 100644 --- a/TAO/TAO_IDL/tao_idl_be.mpc +++ b/TAO/TAO_IDL/tao_idl_be.mpc @@ -1,5 +1,5 @@ // -*- MPC -*- -project(TAO_IDL_BE) : acelib, conv_lib, tao_output, tao_vc8warnings, tao_idl_fe { +project(TAO_IDL_BE) : acelib, conv_lib, tao_rules, tao_output, tao_vc8warnings, tao_idl_fe { sharedname = TAO_IDL_BE dynamicflags += TAO_IDL_BE_BUILD_DLL includes += $(TAO_ROOT) diff --git a/TAO/TAO_IDL/tao_idl_fe.mpc b/TAO/TAO_IDL/tao_idl_fe.mpc index 020936b5c89..80ed849937f 100644 --- a/TAO/TAO_IDL/tao_idl_fe.mpc +++ b/TAO/TAO_IDL/tao_idl_fe.mpc @@ -50,7 +50,7 @@ project(TAO_IDL_GEN) { } } -project(TAO_IDL_FE) : acelib, conv_lib, tao_output { +project(TAO_IDL_FE) : acelib, conv_lib, tao_rules, tao_output { sharedname = TAO_IDL_FE dynamicflags += TAO_IDL_FE_BUILD_DLL includes += $(TAO_ROOT) diff --git a/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.h b/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.h index 101a0ceb880..6fe0271458d 100644 --- a/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.h +++ b/TAO/orbsvcs/ImplRepo_Service/AsyncListManager.h @@ -19,11 +19,7 @@ #endif /* ACE_LACKS_PRAGMA_ONCE */ #include "tao/Intrusive_Ref_Count_Handle_T.h" -#if defined (ACE_HAS_CPP11) -# include <atomic> -#else -# include "ace/Atomic_Op.h" -#endif /* ACE_HAS_CPP11 */ +#include <atomic> #include "LiveCheck.h" class Locator_Repository; @@ -78,11 +74,7 @@ class AsyncListManager CORBA::ULong first_; CORBA::ULong how_many_; CORBA::ULong waiters_; -#if defined (ACE_HAS_CPP11) std::atomic<int> refcount_; -#else - ACE_Atomic_Op<TAO_SYNCH_MUTEX, int> refcount_; -#endif /* ACE_HAS_CPP11 */ }; typedef TAO_Intrusive_Ref_Count_Handle<AsyncListManager> AsyncListManager_ptr; diff --git a/TAO/tao/Object.h b/TAO/tao/Object.h index ca691fdba5c..92c2e499c85 100644 --- a/TAO/tao/Object.h +++ b/TAO/tao/Object.h @@ -342,12 +342,8 @@ namespace CORBA TAO::Object_Proxy_Broker *proxy_broker () const; /// Number of outstanding references to this object. -#if defined (ACE_HAS_CPP11) # define TAO_OBJECT_USES_STD_ATOMIC_REFCOUNT std::atomic<uint32_t> refcount_; -#else - ACE_Atomic_Op<TAO_SYNCH_MUTEX, unsigned long> refcount_; -#endif /* ACE_HAS_CPP11 */ private: // = Unimplemented methods |