diff options
Diffstat (limited to 'src/bin/d2/d2_update_mgr.h')
| -rw-r--r-- | src/bin/d2/d2_update_mgr.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/bin/d2/d2_update_mgr.h b/src/bin/d2/d2_update_mgr.h index 740efa8019..f5f0023bdc 100644 --- a/src/bin/d2/d2_update_mgr.h +++ b/src/bin/d2/d2_update_mgr.h @@ -1,4 +1,4 @@ -// Copyright (C) 2013 Internet Systems Consortium, Inc. ("ISC") +// Copyright (C) 2013, 2015 Internet Systems Consortium, Inc. ("ISC") // // Permission to use, copy, modify, and/or distribute this software for any // purpose with or without fee is hereby granted, provided that the above @@ -17,8 +17,8 @@ /// @file d2_update_mgr.h This file defines the class D2UpdateMgr. +#include <asiolink/io_service.h> #include <exceptions/exceptions.h> -#include <d2/d2_asio.h> #include <d2/d2_log.h> #include <d2/d2_queue_mgr.h> #include <d2/d2_cfg_mgr.h> @@ -100,7 +100,7 @@ public: /// @throw D2UpdateMgrError if either the queue manager or configuration /// managers are NULL, or max transactions is less than one. D2UpdateMgr(D2QueueMgrPtr& queue_mgr, D2CfgMgrPtr& cfg_mgr, - IOServicePtr& io_service, + asiolink::IOServicePtr& io_service, const size_t max_transactions = MAX_TRANSACTIONS_DEFAULT); /// @brief Destructor @@ -173,7 +173,7 @@ public: /// @brief Gets the D2UpdateMgr's IOService. /// /// @return returns a reference to the IOService - const IOServicePtr& getIOService() { + const asiolink::IOServicePtr& getIOService() { return (io_service_); } @@ -246,7 +246,7 @@ private: /// passed into transactions to manager their IO events. /// (For future reference, multi-threaded transactions would each use their /// own IOService instance.) - IOServicePtr io_service_; + asiolink::IOServicePtr io_service_; /// @brief Maximum number of concurrent transactions. size_t max_transactions_; |