diff options
| author | Riccardo Spagni <ric@spagni.net> | 2015-12-18 12:17:56 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2015-12-18 12:18:00 +0200 |
| commit | 5d33b43d8d957b4ec8051f54a1d14af35226a6dd (patch) | |
| tree | 1c990ef843dc0ecb09d4ec24dfa9f7787f02bc86 | |
| parent | Merge pull request #543 (diff) | |
| parent | replace std::auto_ptr with std::unique_ptr (diff) | |
| download | monero-5d33b43d8d957b4ec8051f54a1d14af35226a6dd.tar.xz | |
Merge pull request #544
01e92eb replace std::auto_ptr with std::unique_ptr (moneromooo-monero)
| -rw-r--r-- | src/cryptonote_core/blockchain.cpp | 2 | ||||
| -rw-r--r-- | src/wallet/wallet2.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/cryptonote_core/blockchain.cpp b/src/cryptonote_core/blockchain.cpp index bf7294375..45ddc45e9 100644 --- a/src/cryptonote_core/blockchain.cpp +++ b/src/cryptonote_core/blockchain.cpp @@ -2059,7 +2059,7 @@ bool Blockchain::check_tx_inputs(const transaction& tx, uint64_t* pmax_used_bloc boost::asio::io_service ioservice; boost::thread_group threadpool; - std::auto_ptr < boost::asio::io_service::work > work(new boost::asio::io_service::work(ioservice)); + std::unique_ptr < boost::asio::io_service::work > work(new boost::asio::io_service::work(ioservice)); if(threads > 1) { for (int i = 0; i < threads; i++) diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 8fc07db2c..903e70097 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -229,7 +229,7 @@ void wallet2::process_new_transaction(const cryptonote::transaction& tx, uint64_ // process the other outs from that tx boost::asio::io_service ioservice; boost::thread_group threadpool; - std::auto_ptr < boost::asio::io_service::work > work(new boost::asio::io_service::work(ioservice)); + std::unique_ptr < boost::asio::io_service::work > work(new boost::asio::io_service::work(ioservice)); for (int i = 0; i < threads; i++) { threadpool.create_thread(boost::bind(&boost::asio::io_service::run, &ioservice)); @@ -265,7 +265,7 @@ void wallet2::process_new_transaction(const cryptonote::transaction& tx, uint64_ { boost::asio::io_service ioservice; boost::thread_group threadpool; - std::auto_ptr < boost::asio::io_service::work > work(new boost::asio::io_service::work(ioservice)); + std::unique_ptr < boost::asio::io_service::work > work(new boost::asio::io_service::work(ioservice)); for (int i = 0; i < threads; i++) { threadpool.create_thread(boost::bind(&boost::asio::io_service::run, &ioservice)); |