update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / boost / libs / gil / test / core / image_view / collection.cpp

diff --git a/ceph/src/boost/libs/gil/test/core/image_view/collection.cpp b/ceph/src/boost/libs/gil/test/core/image_view/collection.cpp
index 0d810d157a2c4b5367e96f1d7062ec3a06324d07..1134888053b1efd1f00f7bbbd1f70609e8b0a19b 100644 (file)
--- a/ceph/src/boost/libs/gil/test/core/image_view/collection.cpp
+++ b/ceph/src/boost/libs/gil/test/core/image_view/collection.cpp
@@ -1,5 +1,5 @@
 //
-// Copyright 2018 Mateusz Loskot <mateusz at loskot dot net>
+// Copyright 2018-2020 Mateusz Loskot <mateusz at loskot dot net>
 //
 // Distributed under the Boost Software License, Version 1.0
 // See accompanying file LICENSE_1_0.txt or copy at
@@ -11,16 +11,25 @@
 
 #include <boost/core/lightweight_test.hpp>
 
+#include <iterator>
+
+#include "test_utility_output_stream.hpp"
+
 namespace gil = boost::gil;
 
+namespace
+{
 gil::gray8_pixel_t const gray128(128);
 gil::gray8_pixel_t const gray255(255);
+} // unnamed namespace
+
+// Collection
 
 void test_begin()
 {
     gil::gray8_image_t image(2, 2, gray255);
     auto view = gil::view(image);
-    BOOST_TEST(*view.begin() == gray255);
+    BOOST_TEST_EQ(*view.begin(), gray255);
 }
 
 void test_end()
@@ -29,34 +38,6 @@ void test_end()
     BOOST_TEST(view.begin() == view.end());
 }
 
-void test_rbegin()
-{
-    gil::gray8_image_t image(2, 2, gray255);
-    auto view = gil::view(image);
-    view(1,1) = gray128;
-    BOOST_TEST(*view.rbegin() == gray128);
-}
-
-void test_rend()
-{
-    gil::gray8_image_t::view_t view;
-    BOOST_TEST(view.rbegin() == view.rend());
-}
-
-void test_front()
-{
-    gil::gray8_image_t image(2, 2, gray255);
-    auto view = gil::view(image);
-    BOOST_TEST(view.front() == gray255);
-}
-
-void test_back()
-{
-    gil::gray8_image_t image(2, 2, gray255);
-    auto view = gil::view(image);
-    BOOST_TEST(view.back() == gray255);
-}
-
 void test_empty()
 {
     gil::gray8_image_t::view_t view;
@@ -90,22 +71,49 @@ void test_swap()
     BOOST_TEST(!view2.empty());
 }
 
+// ForwardCollection
+
+void test_back()
+{
+    gil::gray8_image_t image(2, 2, gray255);
+    auto view = gil::view(image);
+    BOOST_TEST_EQ(view.back(), gray255);
+}
+
+void test_front()
+{
+    gil::gray8_image_t image(2, 2, gray255);
+    auto view = gil::view(image);
+    BOOST_TEST_EQ(view.front(), gray255);
+}
+
+// ReversibleCollection
+
+void test_rbegin()
+{
+    gil::gray8_image_t image(2, 2, gray255);
+    auto view = gil::view(image);
+    view(1,1) = gray128;
+    BOOST_TEST_EQ(*view.rbegin(), gray128);
+}
+
+void test_rend()
+{
+    gil::gray8_image_t::view_t view;
+    BOOST_TEST(view.rbegin() == view.rend());
+}
+
 int main()
 {
-    // Collection
     test_begin();
     test_end();
-    test_size();
     test_empty();
+    test_size();
     test_swap();
-
-    // ForwardCollection
+    test_back();
     test_front();
-
-    // ReversibleCollection
     test_rbegin();
     test_rend();
-    test_back();
 
-    return boost::report_errors();
+    return ::boost::report_errors();
 }