Imported Upstream version 1.70.0upstream/1.70.0

1 files changed, 8 insertions, 7 deletions

diff --git a/boost/gil/cmyk.hpp b/boost/gil/cmyk.hpp
index 0fd3f40984..c288b850bc 100644
--- a/boost/gil/cmyk.hpp
+++ b/boost/gil/cmyk.hpp
@@ -21,31 +21,32 @@ namespace boost { namespace gil {
 /// \{
 
 /// \brief Cyan
-struct cyan_t {};    
+struct cyan_t {};
 
 /// \brief Magenta
 struct magenta_t {};
 
 /// \brief Yellow
-struct yellow_t {}; 
+struct yellow_t {};
 
 /// \brief Black
 struct black_t {};
 /// \}
 
 /// \ingroup ColorSpaceModel
-typedef mpl::vector4<cyan_t,magenta_t,yellow_t,black_t>  cmyk_t;
+using cmyk_t = mpl::vector4<cyan_t,magenta_t,yellow_t,black_t>;
 
 /// \ingroup LayoutModel
-typedef layout<cmyk_t> cmyk_layout_t;
+using cmyk_layout_t = layout<cmyk_t>;
 
 /// \ingroup ImageViewConstructors
 /// \brief from raw CMYK planar data
 template <typename IC>
 inline typename type_from_x_iterator<planar_pixel_iterator<IC,cmyk_t> >::view_t
-planar_cmyk_view(std::size_t width, std::size_t height, IC c, IC m, IC y, IC k, std::ptrdiff_t rowsize_in_bytes) {
-    typedef typename type_from_x_iterator<planar_pixel_iterator<IC,cmyk_t> >::view_t RView;
-    return RView(width, height, typename RView::locator(planar_pixel_iterator<IC,cmyk_t>(c,m,y,k), rowsize_in_bytes));
+planar_cmyk_view(std::size_t width, std::size_t height, IC c, IC m, IC y, IC k, std::ptrdiff_t rowsize_in_bytes)
+{
+    using view_t = typename type_from_x_iterator<planar_pixel_iterator<IC,cmyk_t> >::view_t;
+    return view_t(width, height, typename view_t::locator(planar_pixel_iterator<IC,cmyk_t>(c,m,y,k), rowsize_in_bytes));
 }
 
 } }  // namespace gil