aboutsummaryrefslogtreecommitdiff
path: root/src/FbTk/Menu.hh
diff options
context:
space:
mode:
authorMathias Gumz <akira@fluxbox.org>2016-08-27 08:05:34 (GMT)
committerMathias Gumz <akira@fluxbox.org>2016-08-28 17:49:30 (GMT)
commitbb013f5c75120df0f86a7a17cbae61bdca2618f4 (patch)
tree9d734ef939aa962976e7ee1eca57d75ce1720b71 /src/FbTk/Menu.hh
parent1e235e3f01733e3282a76e6be8862206d1504bdf (diff)
downloadfluxbox-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/FbTk/Menu.hh')
-rw-r--r--src/FbTk/Menu.hh4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/FbTk/Menu.hh b/src/FbTk/Menu.hh
index 8bb5fdd..231b622 100644
--- a/src/FbTk/Menu.hh
+++ b/src/FbTk/Menu.hh
@@ -189,7 +189,7 @@ private:
189 Menu *m_parent; 189 Menu *m_parent;
190 190
191 std::vector<MenuItem*> m_items; 191 std::vector<MenuItem*> m_items;
192 std::auto_ptr<MenuSearch> m_search; 192 std::unique_ptr<MenuSearch> m_search;
193 193
194 struct State { 194 struct State {
195 bool moving; 195 bool moving;
@@ -239,7 +239,7 @@ private:
239 239
240 FbTk::ThemeProxy<MenuTheme>& m_theme; 240 FbTk::ThemeProxy<MenuTheme>& m_theme;
241 ImageControl& m_image_ctrl; 241 ImageControl& m_image_ctrl;
242 std::auto_ptr<FbTk::Shape> m_shape; // the corners 242 std::unique_ptr<FbTk::Shape> m_shape; // the corners
243 Pixmap m_hilite_pixmap; 243 Pixmap m_hilite_pixmap;
244 Alignment m_alignment; 244 Alignment m_alignment;
245 245