Mercurial > hg > orthanc-stone
diff Applications/Generic/NativeStoneApplicationContext.h @ 334:c34784e5f299 am-2
compatibility fixes
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 18 Oct 2018 09:02:24 +0200 |
parents | 87376a645ee1 |
children | 6cc3ce74dc05 |
line wrap: on
line diff
--- a/Applications/Generic/NativeStoneApplicationContext.h Wed Oct 17 19:42:56 2018 +0200 +++ b/Applications/Generic/NativeStoneApplicationContext.h Thu Oct 18 09:02:24 2018 +0200 @@ -37,11 +37,11 @@ static void UpdateThread(NativeStoneApplicationContext* that); - boost::mutex globalMutex_; - std::unique_ptr<WidgetViewport> centralViewport_; - boost::thread updateThread_; - bool stopped_; - unsigned int updateDelayInMs_; + boost::mutex globalMutex_; + std::auto_ptr<WidgetViewport> centralViewport_; + boost::thread updateThread_; + bool stopped_; + unsigned int updateDelayInMs_; public: class GlobalMutexLocker: public boost::noncopyable @@ -50,15 +50,22 @@ public: GlobalMutexLocker(NativeStoneApplicationContext& that): lock_(that.globalMutex_) - {} + { + } }; NativeStoneApplicationContext(); - virtual ~NativeStoneApplicationContext() {} + virtual ~NativeStoneApplicationContext() + { + } virtual IWidget& SetCentralWidget(IWidget* widget); // Takes ownership - IViewport& GetCentralViewport() {return *(centralViewport_.get());} + + IViewport& GetCentralViewport() + { + return *(centralViewport_.get()); + } void Start(); @@ -68,6 +75,5 @@ { updateDelayInMs_ = delayInMs; } - }; }