diff options
author | Mathias Gumz <akira@fluxbox.org> | 2016-08-27 08:05:34 (GMT) |
---|---|---|
committer | Mathias Gumz <akira@fluxbox.org> | 2016-08-28 17:49:30 (GMT) |
commit | bb013f5c75120df0f86a7a17cbae61bdca2618f4 (patch) | |
tree | 9d734ef939aa962976e7ee1eca57d75ce1720b71 /src/Screen.cc | |
parent | 1e235e3f01733e3282a76e6be8862206d1504bdf (diff) | |
download | fluxbox-bb013f5c75120df0f86a7a17cbae61bdca2618f4.zip fluxbox-bb013f5c75120df0f86a7a17cbae61bdca2618f4.tar.bz2 |
fix compiler warning about std::auto_ptr
fluxbox uses std::unique_ptr<> where it previously used std::auto_ptr<>.
C++0X was approved in 2011. among other things, it deprecates std::auto_ptr.
5 years is long enough for compilers to catch up the standard.
Diffstat (limited to 'src/Screen.cc')
-rw-r--r-- | src/Screen.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/Screen.cc b/src/Screen.cc index 277952b..53b772e 100644 --- a/src/Screen.cc +++ b/src/Screen.cc | |||
@@ -193,7 +193,6 @@ BScreen::BScreen(FbTk::ResourceManager &rm, | |||
193 | unsigned int opts) : | 193 | unsigned int opts) : |
194 | m_layermanager(num_layers), | 194 | m_layermanager(num_layers), |
195 | root_colormap_installed(false), | 195 | root_colormap_installed(false), |
196 | m_image_control(0), | ||
197 | m_current_workspace(0), | 196 | m_current_workspace(0), |
198 | m_focused_windowtheme(new FbWinFrameTheme(scrn, ".focus", ".Focus")), | 197 | m_focused_windowtheme(new FbWinFrameTheme(scrn, ".focus", ".Focus")), |
199 | m_unfocused_windowtheme(new FbWinFrameTheme(scrn, ".unfocus", ".Unfocus")), | 198 | m_unfocused_windowtheme(new FbWinFrameTheme(scrn, ".unfocus", ".Unfocus")), |
@@ -215,7 +214,6 @@ BScreen::BScreen(FbTk::ResourceManager &rm, | |||
215 | m_altname(altscreenname), | 214 | m_altname(altscreenname), |
216 | m_focus_control(new FocusControl(*this)), | 215 | m_focus_control(new FocusControl(*this)), |
217 | m_placement_strategy(new ScreenPlacement(*this)), | 216 | m_placement_strategy(new ScreenPlacement(*this)), |
218 | m_cycle_opts(0), | ||
219 | m_opts(opts) { | 217 | m_opts(opts) { |
220 | 218 | ||
221 | 219 | ||
@@ -643,7 +641,7 @@ void BScreen::propertyNotify(Atom atom) { | |||
643 | &ret_bytes_after, (unsigned char **)&str); | 641 | &ret_bytes_after, (unsigned char **)&str); |
644 | } | 642 | } |
645 | 643 | ||
646 | static std::auto_ptr<FbTk::Command<void> > cmd(0); | 644 | static std::unique_ptr<FbTk::Command<void> > cmd; |
647 | cmd.reset(FbTk::CommandParser<void>::instance().parse(str, false)); | 645 | cmd.reset(FbTk::CommandParser<void>::instance().parse(str, false)); |
648 | if (cmd.get()) { | 646 | if (cmd.get()) { |
649 | cmd->execute(); | 647 | cmd->execute(); |