diff options
author | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-11-10 15:33:50 +0100 |
---|---|---|
committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2020-11-10 15:33:50 +0100 |
commit | 9fc7df737a14559cd7df02edd56a2cc41f2f6ef8 (patch) | |
tree | 2e31a1d306f6e6a1fccad76f1a4e453a1cb63e12 /TAO/TAO_IDL | |
parent | 698de2c3f53cd82ed68851cf3af12a7f3047b8f0 (diff) | |
download | ATCD-9fc7df737a14559cd7df02edd56a2cc41f2f6ef8.tar.gz |
Remove checks for ACE_HAS_CPP11 and remove the code for C++03 now that we require C++11 compiler support
* ACE/ACEXML/examples/SAXPrint/main.cpp:
* ACE/ace/ARGV.h:
* ACE/ace/Basic_Types.h:
* ACE/ace/Bound_Ptr.h:
* ACE/ace/Bound_Ptr.inl:
* ACE/ace/CDR_Stream.cpp:
* ACE/ace/Codeset_IBM1047.cpp:
* ACE/ace/Event_Handler.cpp:
* ACE/ace/Event_Handler.h:
* ACE/ace/Global_Macros.h:
* ACE/ace/OS_NS_Thread.cpp:
* ACE/ace/Proactor.cpp:
* ACE/ace/Process_Manager.h:
* ACE/ace/Reactor.h:
* ACE/ace/Reactor_Timer_Interface.h:
* ACE/ace/Signal.h:
* ACE/ace/Thread_Manager.cpp:
* ACE/ace/Time_Policy.h:
* ACE/ace/Time_Value.cpp:
* ACE/ace/Time_Value.h:
* ACE/ace/Time_Value.inl:
* ACE/ace/WFMO_Reactor.cpp:
* ACE/ace/XML_Utils/XML_Helper.h:
* ACE/ace/XML_Utils/XSCRT/Elements.hpp:
* ACE/ace/config-macosx-lion.h:
* ACE/examples/APG/Active_Objects/AO.cpp:
* ACE/examples/APG/Active_Objects/AO2.cpp:
* ACE/examples/APG/Naming/Name_Binding.h:
* ACE/examples/APG/Reactor/HAStatus.cpp:
* ACE/examples/Threads/future1.cpp:
* ACE/examples/Threads/future2.cpp:
* ACE/netsvcs/lib/Client_Logging_Handler.cpp:
* ACE/netsvcs/lib/Server_Logging_Handler_T.cpp:
* ACE/tests/Bound_Ptr_Test.cpp:
* ACE/tests/Bug_2540_Regression_Test.cpp:
* ACE/tests/Bug_2820_Regression_Test.cpp:
* ACE/tests/Chrono_Test.cpp:
* ACE/tests/Compiler_Features_15_Test.cpp:
* ACE/tests/Compiler_Features_16_Test.cpp:
* ACE/tests/Compiler_Features_17_Test.cpp:
* ACE/tests/Compiler_Features_18_Test.cpp:
* ACE/tests/Compiler_Features_19_Test.cpp:
* ACE/tests/Compiler_Features_20_DLL.h:
* ACE/tests/Compiler_Features_21_Test.cpp:
* ACE/tests/Compiler_Features_23_Test.cpp:
* ACE/tests/Compiler_Features_24_Test.cpp:
* ACE/tests/Compiler_Features_25_Test.cpp:
* ACE/tests/Compiler_Features_26_Test.cpp:
* ACE/tests/Compiler_Features_27_Test.cpp:
* ACE/tests/Compiler_Features_28_Test.cpp:
* ACE/tests/Compiler_Features_29_Test.cpp:
* ACE/tests/Compiler_Features_31_Test.cpp:
* ACE/tests/Compiler_Features_32_Test.cpp:
* ACE/tests/Compiler_Features_34_Test.cpp:
* ACE/tests/Compiler_Features_35_Test.cpp:
* ACE/tests/Compiler_Features_36_Test.cpp:
* ACE/tests/DLL_Test.cpp:
* ACE/tests/Process_Manager_Test.cpp:
* ACE/tests/Reactor_Remove_Resume_Test.cpp:
* ACE/tests/Reactor_Timer_Test.cpp:
* ACE/tests/Task_Ex_Test.cpp:
* TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp:
* TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp:
* TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp:
* TAO/TAO_IDL/be_include/be_helper.h:
* TAO/orbsvcs/ImplRepo_Service/AsyncListManager.h:
* TAO/tao/Object.h:
Diffstat (limited to 'TAO/TAO_IDL')
-rw-r--r-- | TAO/TAO_IDL/be/be_visitor_interface/interface_ch.cpp | 20 | ||||
-rw-r--r-- | TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp | 4 | ||||
-rw-r--r-- | TAO/TAO_IDL/be/be_visitor_valuetype/valuetype_cs.cpp | 8 | ||||
-rw-r--r-- | TAO/TAO_IDL/be_include/be_helper.h | 4 |
4 files changed, 12 insertions, 24 deletions
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); |