Merge pull request #140 from ned14/dev/139_render_this

feat!: Align `path_view::render_*` APIs with P1036R6
ned14 · Aug 29, 2024 · 2ff292f · 2ff292f
2 parents 95a1816 + 6078da5
commit 2ff292f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/example/path_view_openat.cpp b/example/path_view_openat.cpp
@@ -71,7 +71,7 @@ namespace path_view_openat_example
       if(base != nullptr || is_ntpath)
       {
         // The NT kernel always takes the system wide encoding
-        auto zpath = path.render_unterminated<wchar_t>(path);
+        auto zpath = path.render_unterminated<wchar_t>();
         UNICODE_STRING _path{};
         _path.Buffer = const_cast<wchar_t *>(zpath.data());
         _path.MaximumLength =
@@ -109,14 +109,14 @@ namespace path_view_openat_example
       if constexpr(is_same_v<type, char>)
       {
         // Render to the system narrow encoding null terminated
-        auto zpath = path.render_null_terminated<char>(path);
+        auto zpath = path.render_null_terminated<char>();
         return CreateFileA(zpath.c_str(), access, share, nullptr, creation,
                            flags, nullptr);
       }
       else  // char8_t, char16_t, wchar_t
       {
         // Render to the system wide encoding null terminated
-        auto zpath = path.render_null_terminated<wchar_t>(path);
+        auto zpath = path.render_null_terminated<wchar_t>();
         return CreateFileW(zpath.c_str(), access, share, nullptr, creation,
                            flags, nullptr);
       }

diff --git a/include/llfio/v2.0/path_view.hpp b/include/llfio/v2.0/path_view.hpp
@@ -1563,21 +1563,19 @@ class LLFIO_DECL path_view_component
   LLFIO_TREQUIRES(LLFIO_TPRED(is_source_acceptable<T>),
                   LLFIO_TEXPR(std::is_constructible<rendered_path<zero_termination::zero_terminated, T, AllocatorOrDeleter, _internal_buffer_size>,
                                                     path_view_component, Args...>::value))
-  rendered_path<zero_termination::zero_terminated, T, AllocatorOrDeleter, _internal_buffer_size> render_null_terminated(path_view_component view,
-                                                                                                                        Args &&...args) const
+  rendered_path<zero_termination::zero_terminated, T, AllocatorOrDeleter, _internal_buffer_size> render_null_terminated(Args &&...args) const
   {
-    return rendered_path<zero_termination::zero_terminated, T, AllocatorOrDeleter, _internal_buffer_size>(view, std::forward<Args>(args)...);
+    return rendered_path<zero_termination::zero_terminated, T, AllocatorOrDeleter, _internal_buffer_size>(*this, std::forward<Args>(args)...);
   }
   //! Convenience function
   LLFIO_TEMPLATE(class T = typename filesystem::path::value_type, class AllocatorOrDeleter = default_rendered_path_deleter<T[]>,
                  size_t _internal_buffer_size = default_internal_buffer_size, class... Args)
   LLFIO_TREQUIRES(LLFIO_TPRED(is_source_acceptable<T>),
                   LLFIO_TEXPR(std::is_constructible<rendered_path<zero_termination::zero_terminated, T, AllocatorOrDeleter, _internal_buffer_size>,
                                                     path_view_component, Args...>::value))
-  rendered_path<zero_termination::not_zero_terminated, T, AllocatorOrDeleter, _internal_buffer_size> render_unterminated(path_view_component view,
-                                                                                                                         Args &&...args) const
+  rendered_path<zero_termination::not_zero_terminated, T, AllocatorOrDeleter, _internal_buffer_size> render_unterminated(Args &&...args) const
   {
-    return rendered_path<zero_termination::not_zero_terminated, T, AllocatorOrDeleter, _internal_buffer_size>(view, std::forward<Args>(args)...);
+    return rendered_path<zero_termination::not_zero_terminated, T, AllocatorOrDeleter, _internal_buffer_size>(*this, std::forward<Args>(args)...);
   }
 
 #ifdef __cpp_concepts