diff --git a/source/basic_types.cpp b/source/basic_types.cpp index 5820c3cf..b5f7716b 100644 --- a/source/basic_types.cpp +++ b/source/basic_types.cpp @@ -621,24 +621,24 @@ namespace nana return *this; } - point rectangle::position() const + point rectangle::position() const noexcept { return{ x, y }; } - rectangle& rectangle::position(const point& p) + rectangle& rectangle::position(const point& p) noexcept { x = p.x; y = p.y; return *this; } - size rectangle::dimension() const + size rectangle::dimension() const noexcept { return{width, height}; } - rectangle& rectangle::dimension(const size& sz) + rectangle& rectangle::dimension(const size& sz) noexcept { width = sz.width; height = sz.height; diff --git a/source/gui/place_parts.hpp b/source/gui/place_parts.hpp index 5f777e3b..d9d7c2d7 100644 --- a/source/gui/place_parts.hpp +++ b/source/gui/place_parts.hpp @@ -387,7 +387,7 @@ namespace nana } panels_.emplace_back(); - auto wdg = wdg.get(); + auto wdg_ptr = wdg.get(); panels_.back().widget_ptr.swap(wdg); for (auto & pn : panels_) @@ -395,7 +395,7 @@ namespace nana if (pn.widget_ptr) pn.widget_ptr->move(r); } - return wdg; + return wdg_ptr; } return nullptr; } @@ -698,4 +698,4 @@ namespace nana }//end namespace place_parts }//end namespace nana -#endif //NANA_GUI_PLACE_PARTS_HPP +#endif //NANA_GUI_PLACE_PARTS_HPP \ No newline at end of file