fix clang bug

wjr-z · Jun 28, 2024 · 592645c · 592645c
1 parent 8b789c8
commit 592645c
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 8 deletions.
diff --git a/godbolt/wjr.hpp b/godbolt/wjr.hpp
@@ -7046,6 +7046,10 @@ struct __inserter_container_accessor : Iter {
     using Iter::container;
 };
 
+/// @private
+template <typename Iter>
+__inserter_container_accessor(Iter) -> __inserter_container_accessor<Iter>;
+
 /// @private
 template <typename Iter>
 struct __inserter_iterator_accessor : Iter {
@@ -7055,29 +7059,36 @@ struct __inserter_iterator_accessor : Iter {
     using Iter::iter;
 };
 
+template <typename Iter>
+__inserter_iterator_accessor(Iter) -> __inserter_iterator_accessor<Iter>;
+
 template <typename Container>
 Container &get_inserter_container(std::insert_iterator<Container> it) noexcept(
     std::is_nothrow_copy_constructible_v<std::insert_iterator<Container>>) {
-    return *(__inserter_container_accessor(it).container);
+    __inserter_container_accessor tmp(it);
+    return *(tmp.container);
 }
 
 template <typename Container>
 Container &get_inserter_container(std::back_insert_iterator<Container> it) noexcept(
     std::is_nothrow_copy_constructible_v<std::back_insert_iterator<Container>>) {
-    return *(__inserter_container_accessor(it).container);
+    __inserter_container_accessor tmp(it);
+    return *(tmp.container);
 }
 
 template <typename Container>
 Container &get_inserter_container(std::front_insert_iterator<Container> it) noexcept(
     std::is_nothrow_copy_constructible_v<std::front_insert_iterator<Container>>) {
-    return *(__inserter_container_accessor(it).container);
+    __inserter_container_accessor tmp(it);
+    return *(tmp.container);
 }
 
 template <typename Container>
 typename Container::iterator
 get_inserter_iterator(std::insert_iterator<Container> it) noexcept(
     std::is_nothrow_copy_constructible_v<std::insert_iterator<Container>>) {
-    return __inserter_iterator_accessor(it).iter;
+    __inserter_iterator_accessor tmp(it);
+    return *(tmp.iter);
 }
 
 } // namespace wjr

diff --git a/include/wjr/iterator/inserter.hpp b/include/wjr/iterator/inserter.hpp
@@ -50,6 +50,10 @@ struct __inserter_container_accessor : Iter {
     using Iter::container;
 };
 
+/// @private
+template <typename Iter>
+__inserter_container_accessor(Iter) -> __inserter_container_accessor<Iter>;
+
 /// @private
 template <typename Iter>
 struct __inserter_iterator_accessor : Iter {
@@ -59,29 +63,36 @@ struct __inserter_iterator_accessor : Iter {
     using Iter::iter;
 };
 
+template <typename Iter>
+__inserter_iterator_accessor(Iter) -> __inserter_iterator_accessor<Iter>;
+
 template <typename Container>
 Container &get_inserter_container(std::insert_iterator<Container> it) noexcept(
     std::is_nothrow_copy_constructible_v<std::insert_iterator<Container>>) {
-    return *(__inserter_container_accessor(it).container);
+    __inserter_container_accessor tmp(it);
+    return *(tmp.container);
 }
 
 template <typename Container>
 Container &get_inserter_container(std::back_insert_iterator<Container> it) noexcept(
     std::is_nothrow_copy_constructible_v<std::back_insert_iterator<Container>>) {
-    return *(__inserter_container_accessor(it).container);
+    __inserter_container_accessor tmp(it);
+    return *(tmp.container);
 }
 
 template <typename Container>
 Container &get_inserter_container(std::front_insert_iterator<Container> it) noexcept(
     std::is_nothrow_copy_constructible_v<std::front_insert_iterator<Container>>) {
-    return *(__inserter_container_accessor(it).container);
+    __inserter_container_accessor tmp(it);
+    return *(tmp.container);
 }
 
 template <typename Container>
 typename Container::iterator
 get_inserter_iterator(std::insert_iterator<Container> it) noexcept(
     std::is_nothrow_copy_constructible_v<std::insert_iterator<Container>>) {
-    return __inserter_iterator_accessor(it).iter;
+    __inserter_iterator_accessor tmp(it);
+    return *(tmp.iter);
 }
 
 } // namespace wjr