Fixes for solaris.

asio/include/asio/detail/impl/dev_poll_reactor.ipp

diff --git a/asio/include/asio/detail/impl/dev_poll_reactor.ipp b/asio/include/asio/detail/impl/dev_poll_reactor.ipp
index ac4c391..f0f408d 100644
--- a/asio/include/asio/detail/impl/dev_poll_reactor.ipp
+++ b/asio/include/asio/detail/impl/dev_poll_reactor.ipp
@@ -30,7 +30,7 @@
 namespace detail {
 
 dev_poll_reactor::dev_poll_reactor(asio::execution_context& ctx)
-  : asio::detail::service_base<dev_poll_reactor>(ctx),
+  : asio::detail::execution_context_service_base<dev_poll_reactor>(ctx),
     scheduler_(use_service<scheduler>(ctx)),
     mutex_(),
     dev_poll_fd_(do_dev_poll_create()),
@@ -67,28 +67,6 @@
   scheduler_.abandon_operations(ops);
 } 
 
-<<<<<<< HEAD
-// Helper class to re-register all descriptors with /dev/poll.
-class dev_poll_reactor::fork_helper
-{
-public:
-  fork_helper(dev_poll_reactor* reactor, short events)
-    : reactor_(reactor), events_(events)
-  {
-  }
-
-  bool set(int descriptor)
-  {
-    ::pollfd& ev = reactor_->add_pending_event_change(descriptor);
-    ev.events = events_;
-    return true;
-  }
-
-private:
-  dev_poll_reactor* reactor_;
-  short events_;
-};
-
 void dev_poll_reactor::fork_service(asio::io_service::fork_event fork_ev)
 {
   if (fork_ev == asio::execution_context::fork_child)