# HG changeset patch # User Benjamin Golinvaux # Date 1558348650 -7200 # Node ID f2ee003ba955e7e44ae38150d2de0afb11940436 # Parent d1feb89ea74205ba547b65f982395307f73f8d90 Switch to make_shared in various places diff -r d1feb89ea742 -r f2ee003ba955 Samples/Sdl/BasicScene.cpp --- a/Samples/Sdl/BasicScene.cpp Mon May 20 11:03:50 2019 +0200 +++ b/Samples/Sdl/BasicScene.cpp Mon May 20 12:37:30 2019 +0200 @@ -40,6 +40,9 @@ #include #include +#include +#include + #include #include @@ -216,18 +219,16 @@ switch (event.button.button) { case SDL_BUTTON_MIDDLE: - activeTracker.reset(new PanSceneTracker( - controller, e)); + activeTracker = boost::make_shared(controller, e); break; case SDL_BUTTON_RIGHT: - activeTracker.reset(new ZoomSceneTracker( - controller, e, compositor.GetCanvasHeight())); + activeTracker = boost::make_shared(controller, + e, compositor.GetCanvasHeight()); break; case SDL_BUTTON_LEFT: - activeTracker.reset(new RotateSceneTracker( - controller, e)); + activeTracker = boost::make_shared(controller, e); break; default: @@ -374,8 +375,8 @@ try { MessageBroker broker; - ViewportControllerPtr controller( - new ViewportController(broker)); + ViewportControllerPtr controller = boost::make_shared( + boost::ref(broker)); PrepareScene(controller); Run(controller); }