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 /ACE/ace/Reactor.h | |
| 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 'ACE/ace/Reactor.h')
| -rw-r--r-- | ACE/ace/Reactor.h | 7 |
1 files changed, 3 insertions, 4 deletions
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. |