update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / boost / libs / gil / test / extension / io / cmp_view.hpp

diff --git a/ceph/src/boost/libs/gil/test/extension/io/cmp_view.hpp b/ceph/src/boost/libs/gil/test/extension/io/cmp_view.hpp
index 4be0848d03f996dfefc275bf4f877aee147e7e16..9141f55d45413d727a7e86fb9f06e709957b4b83 100644 (file)
--- a/ceph/src/boost/libs/gil/test/extension/io/cmp_view.hpp
+++ b/ceph/src/boost/libs/gil/test/extension/io/cmp_view.hpp
@@ -5,37 +5,33 @@
 // See accompanying file LICENSE_1_0.txt or copy at
 // http://www.boost.org/LICENSE_1_0.txt
 //
-#ifndef BOOST_GIL_IO_TEST_CMP_VIEW_HPP
-#define BOOST_GIL_IO_TEST_CMP_VIEW_HPP
+#ifndef BOOST_GIL_IO_TEST_EXTENSION_IO_CMP_VIEW_HPP
+#define BOOST_GIL_IO_TEST_EXTENSION_IO_CMP_VIEW_HPP
 
 #include <boost/gil.hpp>
 
-template< typename View_1, typename View_2 >
-void cmp_view( const View_1& v1
-             , const View_2& v2
-             )
+#include <stdexcept>
+
+template <typename View1, typename View2>
+void cmp_view(View1 const& v1, View2 const& v2)
 {
-    if( v1.dimensions() != v2.dimensions() )
-    {
-        throw std::runtime_error( "Images are not equal." );
-    }
+    if (v1.dimensions() != v2.dimensions())
+        throw std::runtime_error("Images are not equal.");
 
-    typename View_1::x_coord_t width  = v1.width();
-    typename View_1::y_coord_t height = v1.height();
+    typename View1::x_coord_t width  = v1.width();
+    typename View1::y_coord_t height = v1.height();
 
-    for( typename View_1::y_coord_t y = 0; y < height; ++y )
+    for (typename View1::y_coord_t y = 0; y < height; ++y)
     {
-        const typename View_1::x_iterator src_it = v1.row_begin( y );
-        const typename View_2::x_iterator dst_it = v2.row_begin( y );
+        typename View1::x_iterator const src_it = v1.row_begin(y);
+        typename View2::x_iterator const dst_it = v2.row_begin(y);
 
-        for( typename View_1::x_coord_t x = 0; x < width; ++x )
+        for (typename View1::x_coord_t x = 0; x < width; ++x)
         {
-            if( *src_it != *dst_it )
-            {
-                throw std::runtime_error( "Images are not equal." );
-            }
+            if (*src_it != *dst_it)
+                throw std::runtime_error("Images are not equal.");
         }
     }
 }
 
-#endif
+#endif // BOOST_GIL_IO_TEST_EXTENSION_IO_CMP_VIEW_HPP