Browse Source

Merge pull request #2033 from LefterisJP/remove_auto_ptr

Remove deprecated std::auto_ptr
cl-refactor
Gav Wood 10 years ago
parent
commit
b4d5577381
  1. 2
      libtestutils/BlockChainLoader.h
  2. 2
      mix/MixClient.h

2
libtestutils/BlockChainLoader.h

@ -44,7 +44,7 @@ public:
private: private:
TransientDirectory m_dir; TransientDirectory m_dir;
std::auto_ptr<eth::BlockChain> m_bc; std::unique_ptr<eth::BlockChain> m_bc;
eth::State m_state; eth::State m_state;
}; };

2
mix/MixClient.h

@ -94,7 +94,7 @@ private:
eth::State m_state; eth::State m_state;
eth::State m_startState; eth::State m_startState;
OverlayDB m_stateDB; OverlayDB m_stateDB;
std::auto_ptr<MixBlockChain> m_bc; std::unique_ptr<MixBlockChain> m_bc;
mutable boost::shared_mutex x_state; mutable boost::shared_mutex x_state;
mutable boost::shared_mutex x_executions; mutable boost::shared_mutex x_executions;
ExecutionResults m_executions; ExecutionResults m_executions;

Loading…
Cancel
Save