Compilers suck.

ThePhD · Apr 3, 2020 · ea2ea0f · ea2ea0f
1 parent 03e0491
commit ea2ea0f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -27,5 +27,9 @@ jobs:
 
     - name: test
       run: |
-        cmake --build build/debug   --config Debug   --target test
-        cmake --build build/release --config Release --target test
+        cd build/debug
+        ctest --build-config Debug
+        cd ../..
+        cd build/release
+        ctest --build-config Release
+        cd ../..
diff --git a/include/itsy/detail/bit_view.hpp b/include/itsy/detail/bit_view.hpp
@@ -755,37 +755,37 @@ namespace ITSY_BITSY_DETAIL_NAMESPACE
 		}
 
 		constexpr __base_iterator
-		_M_storage_begin() noexcept(noexcept(__adl_begin(this->_M_storage_unwrapped())))
+		_M_storage_begin() noexcept(noexcept(__adl_begin(__unwrap_ref(::std::declval<container_type>()))))
 		{
 			return __adl_begin(this->_M_storage_unwrapped());
 		}
 
 		constexpr __base_sentinel
-		_M_storage_end() noexcept(noexcept(__adl_end(this->_M_storage_unwrapped())))
+		_M_storage_end() noexcept(noexcept(__adl_end(__unwrap_ref(::std::declval<container_type>()))))
 		{
 			return __adl_end(this->_M_storage_unwrapped());
 		}
 
 		constexpr __base_c_iterator
-		_M_storage_begin() const noexcept(noexcept(__adl_begin(this->_M_storage_unwrapped())))
+		_M_storage_begin() const noexcept(noexcept(__adl_begin(__unwrap_ref(::std::declval<container_type>()))))
 		{
 			return __adl_begin(this->_M_storage_unwrapped());
 		}
 
 		constexpr __base_c_sentinel
-		_M_storage_end() const noexcept(noexcept(__adl_end(this->_M_storage_unwrapped())))
+		_M_storage_end() const noexcept(noexcept(__adl_end(__unwrap_ref(::std::declval<container_type>()))))
 		{
 			return __adl_end(this->_M_storage_unwrapped());
 		}
 
 		constexpr __base_c_iterator
-		_M_storage_cbegin() const noexcept(noexcept(__adl_cbegin(this->_M_storage_unwrapped())))
+		_M_storage_cbegin() const noexcept(noexcept(__adl_cbegin(__unwrap_ref(::std::declval<container_type>()))))
 		{
 			return __adl_cbegin(this->_M_storage_unwrapped());
 		}
 
 		constexpr __base_c_sentinel
-		_M_storage_cend() const noexcept(noexcept(__adl_cend(this->_M_storage_unwrapped())))
+		_M_storage_cend() const noexcept(noexcept(__adl_cend(__unwrap_ref(::std::declval<container_type>()))))
 		{
 			return __adl_cend(this->_M_storage_unwrapped());
 		}

diff --git a/tests/include/itsy/tests/ranges.hpp b/tests/include/itsy/tests/ranges.hpp
@@ -13,6 +13,8 @@
 #ifndef ITSY_BITSY_TESTS_RANGES_HPP
 #define ITSY_BITSY_TESTS_RANGES_HPP
 
+#include <itsy/bitsy.hpp>
+
 #include <cstddef>
 
 namespace bitsy::tests
@@ -72,7 +74,7 @@ namespace bitsy::tests
 
 		template <typename _Dummy = _It,
 			::std::enable_if_t<
-				__detail::__is_iterator_concept_or_better_v<contiguous_iterator_tag, _Dummy>>* = nullptr>
+				::ITSY_BITSY_DETAIL_NAMESPACE::__is_iterator_concept_or_better_v<::ITSY_BITSY_DETAIL_NAMESPACE::__contiguous_iterator_tag, _Dummy>>* = nullptr>
 		constexpr pointer data() const noexcept {
 			return ::std::addressof(*this->_M_it);
 		}