Merge pull request #931 from CaseyCarter/shhhh

CaseyCarter · web-flow · commit 01ccd0e55286 · 2018-10-31T13:38:02.000-07:00
Silence MSVC warnings, fix reverse_view
diff --git a/cmake/ranges_env.cmake b/cmake/ranges_env.cmake
@@ -50,13 +50,16 @@ else()
   message("[range-v3 warning]: unknown system ${CMAKE_SYSTEM_NAME} !")
 endif()
 
-# Clang-CL will blow up in the standard library if compiling with less than
-# C++14, and MSVC doesn't support less than C++14 at all.
 if (RANGES_CXX_COMPILER_CLANGCL OR RANGES_CXX_COMPILER_MSVC)
-  if (RANGES_CXX_STD EQUAL 11)
-    set(CMAKE_CXX_STANDARD 14)
+  # Clang-CL will blow up in the standard library if compiling with less than
+  # C++14, and MSVC doesn't support less than C++14 at all.
+  if (RANGES_CXX_STD LESS 14)
     set(RANGES_CXX_STD 14)
   endif()
+  # MSVC is currently supported only in 17+ mode
+  if (RANGES_CXX_COMPILER_MSVC AND RANGES_CXX_STD LESS 17)
+    set(RANGES_CXX_STD 17)
+  endif()
   target_compile_definitions(range-v3 INTERFACE _SILENCE_CXX17_TEMPORARY_BUFFER_DEPRECATION_WARNING)
 endif()
 
diff --git a/include/range/v3/detail/config.hpp b/include/range/v3/detail/config.hpp
@@ -197,7 +197,9 @@ namespace ranges
 #define RANGES_DIAGNOSTIC_IGNORE_RANGE_LOOP_ANALYSIS
 #define RANGES_DIAGNOSTIC_IGNORE_DEPRECATED_DECLARATIONS RANGES_DIAGNOSTIC_IGNORE(4996)
 #define RANGES_DIAGNOSTIC_IGNORE_DEPRECATED_THIS_CAPTURE
-#define RANGES_DIAGNOSTIC_IGNORE_DIVIDE_BY_ZERO RANGES_DIAGNOSTIC_IGNORE(4723)
+// Ignores both "divide by zero" and "mod by zero":
+#define RANGES_DIAGNOSTIC_IGNORE_DIVIDE_BY_ZERO \
+    RANGES_DIAGNOSTIC_IGNORE(4723) RANGES_DIAGNOSTIC_IGNORE(4724)
 
 #define RANGES_CXX_VER _MSVC_LANG
 
diff --git a/include/range/v3/range_fwd.hpp b/include/range/v3/range_fwd.hpp
@@ -601,15 +601,7 @@ namespace ranges
             struct repeat_fn;
         }
 
-        namespace detail
-        {
-            template<typename>
-            std::false_type double_reverse(long);
-            template<typename R, meta::if_<std::is_same<R, typename R::unreverse_me>>* = nullptr>
-            std::true_type double_reverse(int);
-        }
-
-        template<typename Rng, bool = decltype(detail::double_reverse<Rng>(42))::value>
+        template<typename Rng>
         struct RANGES_EMPTY_BASES reverse_view;
 
         namespace view
diff --git a/include/range/v3/view/reverse.hpp b/include/range/v3/view/reverse.hpp
@@ -37,7 +37,7 @@ namespace ranges
     {
         /// \addtogroup group-views
         /// @{
-        template<typename Rng, bool /* = decltype(detail::double_reverse<Rng>(42))::value */>
+        template<typename Rng>
         struct RANGES_EMPTY_BASES reverse_view
           : view_interface<reverse_view<Rng>, range_cardinality<Rng>::value>
           , private detail::non_propagating_cache<
@@ -107,22 +107,21 @@ namespace ranges
             {
                 return ranges::size(rng_);
             }
-
-            using unreverse_me = reverse_view;
         };
 
-        template<typename Rng_>
-        struct reverse_view<Rng_, true>
-          : identity_adaptor<decltype(std::declval<Rng_ &>().base())>
+#if !defined(__GNUC__) || defined(__clang__) || __GNUC__ >= 5
+        template<typename Rng>
+        struct reverse_view<reverse_view<Rng>>
+          : identity_adaptor<Rng>
         {
-            using Rng = decltype(std::declval<Rng_ &>().base());
             CONCEPT_ASSERT(BidirectionalRange<Rng>());
 
             reverse_view() = default;
-            explicit constexpr reverse_view(Rng_ rng)
+            explicit constexpr reverse_view(reverse_view<Rng> const &rng)
               : identity_adaptor<Rng>(rng.base())
             {}
         };
+#endif // !GCC4
 
         namespace view
         {
diff --git a/test/algorithm/count.cpp b/test/algorithm/count.cpp
@@ -24,7 +24,7 @@ int main()
     using namespace ranges;
 
     int ia[] = {0, 1, 2, 2, 0, 1, 2, 3};
-    constexpr unsigned cia = size(ia);
+    constexpr auto cia = size(ia);
 
     CHECK(count(input_iterator<const int*>(ia),
                 sentinel<const int*>(ia + cia), 2) == 3);
@@ -41,7 +41,7 @@ int main()
                       sentinel<const int*>(ia)), 2) == 0);
 
     S sa[] = {{0}, {1}, {2}, {2}, {0}, {1}, {2}, {3}};
-    constexpr unsigned csa = size(ia);
+    constexpr auto csa = size(ia);
 
     CHECK(count(input_iterator<const S*>(sa),
                 sentinel<const S*>(sa + csa), 2, &S::i) == 3);
diff --git a/test/algorithm/count_if.cpp b/test/algorithm/count_if.cpp
@@ -31,7 +31,7 @@ int main()
     auto equals = [](int i){ return std::bind(equal_to{}, i, std::placeholders::_1); };
 
     int ia[] = {0, 1, 2, 2, 0, 1, 2, 3};
-    constexpr unsigned cia = size(ia);
+    constexpr auto cia = size(ia);
 
     CHECK(count_if(input_iterator<const int*>(ia),
                    sentinel<const int*>(ia + cia), equals(2)) == 3);
@@ -48,7 +48,7 @@ int main()
                          sentinel<const int*>(ia)), equals(2)) == 0);
 
     S sa[] = {{0}, {1}, {2}, {2}, {0}, {1}, {2}, {3}};
-    constexpr unsigned csa = size(ia);
+    constexpr auto csa = size(ia);
 
     CHECK(count_if(input_iterator<const S*>(sa),
                    sentinel<const S*>(sa + csa), equals(2), &S::i) == 3);
diff --git a/test/algorithm/equal.cpp b/test/algorithm/equal.cpp
@@ -28,7 +28,7 @@ void test()
 {
     using namespace ranges;
     int ia[] = {0, 1, 2, 3, 4, 5};
-    constexpr unsigned s = size(ia);
+    constexpr auto s = size(ia);
     int ib[s] = {0, 1, 2, 5, 4, 5};
     CHECK(equal(input_iterator<const int*>(ia),
                  sentinel<const int*>(ia+s),
@@ -78,7 +78,7 @@ void test_rng()
 {
     using namespace ranges;
     int ia[] = {0, 1, 2, 3, 4, 5};
-    constexpr unsigned s = size(ia);
+    constexpr auto s = size(ia);
     int ib[s] = {0, 1, 2, 5, 4, 5};
     CHECK(equal(make_iterator_range(input_iterator<const int*>(ia),
                  sentinel<const int*>(ia+s)),
@@ -137,7 +137,7 @@ void test_pred()
 {
     using namespace ranges;
     int ia[] = {0, 1, 2, 3, 4, 5};
-    constexpr unsigned s = size(ia);
+    constexpr auto s = size(ia);
     int ib[s] = {0, 1, 2, 5, 4, 5};
     CHECK(equal(input_iterator<const int*>(ia),
                  sentinel<const int*>(ia+s),
@@ -205,7 +205,7 @@ void test_rng_pred()
 {
     using namespace ranges;
     int ia[] = {0, 1, 2, 3, 4, 5};
-    constexpr unsigned s = size(ia);
+    constexpr auto s = size(ia);
     int ib[s] = {0, 1, 2, 5, 4, 5};
     CHECK(equal(make_iterator_range(input_iterator<const int*>(ia),
                  sentinel<const int*>(ia+s)),
diff --git a/test/algorithm/find.cpp b/test/algorithm/find.cpp
@@ -35,7 +35,7 @@ int main()
     using namespace ranges;
 
     int ia[] = {0, 1, 2, 3, 4, 5};
-    constexpr unsigned s = size(ia);
+    constexpr auto s = size(ia);
     input_iterator<const int*> r = find(input_iterator<const int*>(ia),
                                         input_iterator<const int*>(ia+s), 3);
     CHECK(*r == 3);
diff --git a/test/algorithm/find_end.cpp b/test/algorithm/find_end.cpp
@@ -31,7 +31,7 @@ test()
     using namespace ranges;
 
     int ia[] = {0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 0, 1, 2, 3, 0, 1, 2, 0, 1, 0};
-    constexpr unsigned sa = size(ia);
+    constexpr auto sa = size(ia);
     int b[] = {0};
     int c[] = {0, 1};
     int d[] = {0, 1, 2};
@@ -92,7 +92,7 @@ test_pred()
     using namespace ranges;
 
     int ia[] = {0, 1, 2, 3, 4, 5, 0, 1, 2, 3, 4, 0, 1, 2, 3, 0, 1, 2, 0, 1, 0};
-    constexpr unsigned sa = size(ia);
+    constexpr auto sa = size(ia);
     int b[] = {0};
     int c[] = {0, 1};
     int d[] = {0, 1, 2};
@@ -174,7 +174,7 @@ test_proj()
     using namespace ranges;
 
     S ia[] = {{0}, {1}, {2}, {3}, {4}, {5}, {0}, {1}, {2}, {3}, {4}, {0}, {1}, {2}, {3}, {0}, {1}, {2}, {0}, {1}, {0}};
-    constexpr unsigned sa = size(ia);
+    constexpr auto sa = size(ia);
     int b[] = {0};
     int c[] = {0, 1};
     int d[] = {0, 1, 2};
diff --git a/test/algorithm/find_first_of.cpp b/test/algorithm/find_first_of.cpp
@@ -30,9 +30,9 @@ void test_iter()
 {
     using namespace ranges;
     int ia[] = {0, 1, 2, 3, 0, 1, 2, 3};
-    static constexpr unsigned sa = size(ia);
+    static constexpr auto sa = size(ia);
     int ib[] = {1, 3, 5, 7};
-    static constexpr unsigned sb = size(ib);
+    static constexpr auto sb = size(ib);
     CHECK(rng::find_first_of(input_iterator<const int*>(ia),
                              sentinel<const int*>(ia + sa),
                              forward_iterator<const int*>(ib),
@@ -60,9 +60,9 @@ void test_iter_pred()
 {
     using namespace ranges;
     int ia[] = {0, 1, 2, 3, 0, 1, 2, 3};
-    static constexpr unsigned sa = size(ia);
+    static constexpr auto sa = size(ia);
     int ib[] = {1, 3, 5, 7};
-    static constexpr unsigned sb = size(ib);
+    static constexpr auto sb = size(ib);
     CHECK(rng::find_first_of(input_iterator<const int*>(ia),
                              sentinel<const int*>(ia + sa),
                              forward_iterator<const int*>(ib),
@@ -94,9 +94,9 @@ void test_rng()
 {
     using namespace ranges;
     int ia[] = {0, 1, 2, 3, 0, 1, 2, 3};
-    static constexpr unsigned sa = size(ia);
+    static constexpr auto sa = size(ia);
     int ib[] = {1, 3, 5, 7};
-    static constexpr unsigned sb = size(ib);
+    static constexpr auto sb = size(ib);
     CHECK(rng::find_first_of(as_lvalue(make_iterator_range(input_iterator<const int*>(ia),
                              input_iterator<const int*>(ia + sa))),
                              make_iterator_range(forward_iterator<const int*>(ib),
@@ -144,9 +144,9 @@ void test_rng_pred()
 {
     using namespace ranges;
     int ia[] = {0, 1, 2, 3, 0, 1, 2, 3};
-    static constexpr unsigned sa = size(ia);
+    static constexpr auto sa = size(ia);
     int ib[] = {1, 3, 5, 7};
-    static constexpr unsigned sb = size(ib);
+    static constexpr auto sb = size(ib);
     CHECK(rng::find_first_of(as_lvalue(make_iterator_range(input_iterator<const int*>(ia),
                              input_iterator<const int*>(ia + sa))),
                              make_iterator_range(forward_iterator<const int*>(ib),
@@ -183,9 +183,9 @@ void test_rng_pred_proj()
 {
     using namespace ranges;
     S ia[] = {S{0}, S{1}, S{2}, S{3}, S{0}, S{1}, S{2}, S{3}};
-    static constexpr unsigned sa = size(ia);
+    static constexpr auto sa = size(ia);
     S ib[] = {S{1}, S{3}, S{5}, S{7}};
-    static constexpr unsigned sb = size(ib);
+    static constexpr auto sb = size(ib);
     CHECK(rng::find_first_of(as_lvalue(make_iterator_range(input_iterator<const S*>(ia),
                              input_iterator<const S*>(ia + sa))),
                              make_iterator_range(forward_iterator<const S*>(ib),
diff --git a/test/algorithm/find_if.cpp b/test/algorithm/find_if.cpp
@@ -34,7 +34,7 @@ int main()
     using namespace ranges;
 
     int ia[] = {0, 1, 2, 3, 4, 5};
-    constexpr unsigned s = size(ia);
+    constexpr auto s = size(ia);
     input_iterator<const int*> r = find_if(input_iterator<const int*>(ia),
                                            input_iterator<const int*>(ia + s),
                                            [](int i){return i == 3;});
diff --git a/test/algorithm/lexicographical_compare.cpp b/test/algorithm/lexicographical_compare.cpp
@@ -29,7 +29,7 @@ void
 test_iter1()
 {
     int ia[] = {1, 2, 3, 4};
-    constexpr unsigned sa = ranges::size(ia);
+    constexpr auto sa = ranges::size(ia);
     int ib[] = {1, 2, 3};
     CHECK(!ranges::lexicographical_compare(Iter1(ia), Sent1(ia+sa), Iter2(ib), Sent2(ib+2)));
     CHECK(ranges::lexicographical_compare(Iter1(ib), Sent1(ib+2), Iter2(ia), Sent2(ia+sa)));
diff --git a/test/algorithm/mismatch.cpp b/test/algorithm/mismatch.cpp
@@ -30,7 +30,7 @@ template<typename Iter, typename Sent = Iter>
 void test_iter()
 {
     int ia[] = {0, 1, 2, 2, 0, 1, 2, 3};
-    constexpr unsigned sa = ranges::size(ia);
+    constexpr auto sa = ranges::size(ia);
     int ib[] = {0, 1, 2, 3, 0, 1, 2, 3};
     using Pair = std::pair<Iter, Iter>;
     CHECK(ranges::mismatch(Iter(ia), Sent(ia + sa), Iter(ib)) ==
@@ -52,7 +52,7 @@ template<typename Iter, typename Sent = Iter>
 void test_range()
 {
     int ia[] = {0, 1, 2, 2, 0, 1, 2, 3};
-    constexpr unsigned sa = ranges::size(ia);
+    constexpr auto sa = ranges::size(ia);
     int ib[] = {0, 1, 2, 3, 0, 1, 2, 3};
     using Pair = std::pair<Iter, Iter>;
     auto rng1 = ranges::make_iterator_range(Iter(ia), Sent(ia + sa));
diff --git a/test/algorithm/remove.cpp b/test/algorithm/remove.cpp
@@ -35,7 +35,7 @@ void
 test_iter()
 {
     int ia[] = {0, 1, 2, 3, 4, 2, 3, 4, 2};
-    constexpr unsigned sa = ranges::size(ia);
+    constexpr auto sa = ranges::size(ia);
     Iter r = ranges::remove(Iter(ia), Sent(ia+sa), 2);
     CHECK(base(r) == ia + sa-3);
     CHECK(ia[0] == 0);
@@ -51,7 +51,7 @@ void
 test_range()
 {
     int ia[] = {0, 1, 2, 3, 4, 2, 3, 4, 2};
-    constexpr unsigned sa = ranges::size(ia);
+    constexpr auto sa = ranges::size(ia);
     Iter r = ranges::remove(::as_lvalue(ranges::make_iterator_range(Iter(ia), Sent(ia+sa))), 2);
     CHECK(base(r) == ia + sa-3);
     CHECK(ia[0] == 0);
@@ -147,7 +147,7 @@ int main()
 
     // Check projection
     S ia[] = {S{0}, S{1}, S{2}, S{3}, S{4}, S{2}, S{3}, S{4}, S{2}};
-    constexpr unsigned sa = ranges::size(ia);
+    constexpr auto sa = ranges::size(ia);
     S* r = ranges::remove(ia, 2, &S::i);
     CHECK(r == ia + sa-3);
     CHECK(ia[0].i == 0);
@@ -159,7 +159,7 @@ int main()
 
     // Check rvalue range
     S ia2[] = {S{0}, S{1}, S{2}, S{3}, S{4}, S{2}, S{3}, S{4}, S{2}};
-    constexpr unsigned sa2 = ranges::size(ia2);
+    constexpr auto sa2 = ranges::size(ia2);
     auto r2 = ranges::remove(ranges::view::all(ia2), 2, &S::i);
     CHECK(r2.get_unsafe() == ia2 + sa2-3);
     CHECK(ia2[0].i == 0);
diff --git a/test/algorithm/remove_copy.cpp b/test/algorithm/remove_copy.cpp
@@ -35,7 +35,7 @@ void
 test_iter()
 {
     int ia[] = {0, 1, 2, 3, 4, 2, 3, 4, 2};
-    constexpr unsigned sa = ranges::size(ia);
+    constexpr auto sa = ranges::size(ia);
     int ib[sa];
     std::pair<InIter, OutIter> r = ranges::remove_copy(InIter(ia), Sent(ia+sa), OutIter(ib), 2);
     CHECK(base(r.first) == ia + sa);
@@ -53,7 +53,7 @@ void
 test_range()
 {
     int ia[] = {0, 1, 2, 3, 4, 2, 3, 4, 2};
-    constexpr unsigned sa = ranges::size(ia);
+    constexpr auto sa = ranges::size(ia);
     int ib[sa];
     std::pair<InIter, OutIter> r = ranges::remove_copy(::as_lvalue(ranges::make_iterator_range(InIter(ia), Sent(ia+sa))), OutIter(ib), 2);
     CHECK(base(r.first) == ia + sa);
@@ -138,7 +138,7 @@ int main()
     // Check projection
     {
         S ia[] = {S{0}, S{1}, S{2}, S{3}, S{4}, S{2}, S{3}, S{4}, S{2}};
-        constexpr unsigned sa = ranges::size(ia);
+        constexpr auto sa = ranges::size(ia);
         S ib[sa];
         std::pair<S*, S*> r = ranges::remove_copy(ia, ib, 2, &S::i);
         CHECK(r.first == ia + sa);
@@ -154,7 +154,7 @@ int main()
     // Check rvalue range
     {
         S ia[] = {S{0}, S{1}, S{2}, S{3}, S{4}, S{2}, S{3}, S{4}, S{2}};
-        constexpr unsigned sa = ranges::size(ia);
+        constexpr auto sa = ranges::size(ia);
         S ib[sa];
         auto r = ranges::remove_copy(ranges::view::all(ia), ib, 2, &S::i);
         CHECK(r.first.get_unsafe() == ia + sa);
diff --git a/test/algorithm/remove_copy_if.cpp b/test/algorithm/remove_copy_if.cpp
@@ -36,7 +36,7 @@ void
 test_iter()
 {
     int ia[] = {0, 1, 2, 3, 4, 2, 3, 4, 2};
-    constexpr unsigned sa = ranges::size(ia);
+    constexpr auto sa = ranges::size(ia);
     int ib[sa];
     std::pair<InIter, OutIter> r = ranges::remove_copy_if(InIter(ia), Sent(ia+sa), OutIter(ib), [](int i){return i == 2;});
     CHECK(base(r.first) == ia + sa);
@@ -54,7 +54,7 @@ void
 test_range()
 {
     int ia[] = {0, 1, 2, 3, 4, 2, 3, 4, 2};
-    constexpr unsigned sa = ranges::size(ia);
+    constexpr auto sa = ranges::size(ia);
     int ib[sa];
     std::pair<InIter, OutIter> r = ranges::remove_copy_if(::as_lvalue(ranges::make_iterator_range(InIter(ia), Sent(ia+sa))), OutIter(ib), [](int i){return i == 2;});
     CHECK(base(r.first) == ia + sa);
@@ -139,7 +139,7 @@ int main()
     // Check projection
     {
         S ia[] = {S{0}, S{1}, S{2}, S{3}, S{4}, S{2}, S{3}, S{4}, S{2}};
-        constexpr unsigned sa = ranges::size(ia);
+        constexpr auto sa = ranges::size(ia);
         S ib[sa];
         std::pair<S*, S*> r = ranges::remove_copy_if(ia, ib, [](int i){return i == 2;}, &S::i);
         CHECK(r.first == ia + sa);
@@ -155,7 +155,7 @@ int main()
     // Check rvalue range
     {
         S ia[] = {S{0}, S{1}, S{2}, S{3}, S{4}, S{2}, S{3}, S{4}, S{2}};
-        constexpr unsigned sa = ranges::size(ia);
+        constexpr auto sa = ranges::size(ia);
         S ib[sa];
         auto r = ranges::remove_copy_if(ranges::view::all(ia), ib, [](int i){return i == 2;}, &S::i);
         CHECK(r.first.get_unsafe() == ia + sa);
diff --git a/test/algorithm/remove_if.cpp b/test/algorithm/remove_if.cpp
diff --git a/test/algorithm/transform.cpp b/test/algorithm/transform.cpp
diff --git a/test/numeric/accumulate.cpp b/test/numeric/accumulate.cpp
diff --git a/test/numeric/iota.cpp b/test/numeric/iota.cpp
