Mercurial > hg > orthanc-stone

comparison OrthancStone/Sources/Scene2DViewport/MeasureTool.cpp @ 1608:646e581e115b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
replacing nullptr by NULL for VS2008 compatibility
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 28 Oct 2020 22:21:06 +0100
parents 874e178f34e9
children 6594c9709d33
comparison
equal deleted inserted replaced
1607:2df998314507 1608:646e581e115b
50 } 50 }
51 51
52 IViewport::ILock* MeasureTool::GetViewportLock() 52 IViewport::ILock* MeasureTool::GetViewportLock()
53 { 53 {
54 boost::shared_ptr<IViewport> viewport = viewport_.lock(); 54 boost::shared_ptr<IViewport> viewport = viewport_.lock();
55 if(viewport) 55 if (viewport)
56 return viewport->Lock(); 56 return viewport->Lock();
57 else 57 else
58 return nullptr; 58 return NULL;
59 } 59 }
60 60
61 IViewport::ILock* MeasureTool::GetViewportLock() const 61 IViewport::ILock* MeasureTool::GetViewportLock() const
62 { 62 {
63 boost::shared_ptr<IViewport> viewport = viewport_.lock(); 63 boost::shared_ptr<IViewport> viewport = viewport_.lock();
64 if (viewport) 64 if (viewport)
65 return viewport->Lock(); 65 return viewport->Lock();
66 else 66 else
67 return nullptr; 67 return NULL;
68 } 68 }
69 69
70 MeasureTool::MeasureTool(boost::weak_ptr<IViewport> viewport) : 70 MeasureTool::MeasureTool(boost::weak_ptr<IViewport> viewport) :
71 enabled_(true), 71 enabled_(true),
72 viewport_(viewport) 72 viewport_(viewport)