Mercurial > hg > orthanc

comparison OrthancServer/ServerContext.h @ 3712:2a170a8f1faf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
replacing std::auto_ptr by std::unique_ptr
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 02 Mar 2020 15:32:45 +0100
parents 4182cde57afb
children 56f2397f027a
comparison
equal deleted inserted replaced
3709:1f4910999fe7 3712:2a170a8f1faf
181 Deprecated::MemoryCache dicomCache_; // TODO 181 Deprecated::MemoryCache dicomCache_; // TODO
182 182
183 LuaScripting mainLua_; 183 LuaScripting mainLua_;
184 LuaScripting filterLua_; 184 LuaScripting filterLua_;
185 LuaServerListener luaListener_; 185 LuaServerListener luaListener_;
186 std::auto_ptr<SharedArchive> mediaArchive_; 186 std::unique_ptr<SharedArchive> mediaArchive_;
187 187
188 // The "JobsEngine" must be *after* "LuaScripting", as 188 // The "JobsEngine" must be *after* "LuaScripting", as
189 // "LuaScripting" embeds "LuaJobManager" that registers as an 189 // "LuaScripting" embeds "LuaJobManager" that registers as an
190 // observer to "SequenceOfOperationsJob", whose lifetime 190 // observer to "SequenceOfOperationsJob", whose lifetime
191 // corresponds to that of "JobsEngine". It must also be after 191 // corresponds to that of "JobsEngine". It must also be after
204 bool isJobsEngineUnserialized_; 204 bool isJobsEngineUnserialized_;
205 SharedMessageQueue pendingChanges_; 205 SharedMessageQueue pendingChanges_;
206 boost::thread changeThread_; 206 boost::thread changeThread_;
207 boost::thread saveJobsThread_; 207 boost::thread saveJobsThread_;
208 208
209 std::auto_ptr<SharedArchive> queryRetrieveArchive_; 209 std::unique_ptr<SharedArchive> queryRetrieveArchive_;
210 std::string defaultLocalAet_; 210 std::string defaultLocalAet_;
211 OrthancHttpHandler httpHandler_; 211 OrthancHttpHandler httpHandler_;
212 bool saveJobs_; 212 bool saveJobs_;
213 FindStorageAccessMode findStorageAccessMode_; 213 FindStorageAccessMode findStorageAccessMode_;
214 unsigned int limitFindInstances_; 214 unsigned int limitFindInstances_;
215 unsigned int limitFindResults_; 215 unsigned int limitFindResults_;
216 216
217 std::auto_ptr<MetricsRegistry> metricsRegistry_; 217 std::unique_ptr<MetricsRegistry> metricsRegistry_;
218 bool isHttpServerSecure_; 218 bool isHttpServerSecure_;
219 bool isExecuteLuaEnabled_; 219 bool isExecuteLuaEnabled_;
220 220
221 public: 221 public:
222 class DicomCacheLocker : public boost::noncopyable 222 class DicomCacheLocker : public boost::noncopyable