Skip to content

Commit 2ff292f

Browse files
authored
Merge pull request #140 from ned14/dev/139_render_this
feat!: Align `path_view::render_*` APIs with P1036R6
2 parents 95a1816 + 6078da5 commit 2ff292f

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

example/path_view_openat.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ namespace path_view_openat_example
7171
if(base != nullptr || is_ntpath)
7272
{
7373
// The NT kernel always takes the system wide encoding
74-
auto zpath = path.render_unterminated<wchar_t>(path);
74+
auto zpath = path.render_unterminated<wchar_t>();
7575
UNICODE_STRING _path{};
7676
_path.Buffer = const_cast<wchar_t *>(zpath.data());
7777
_path.MaximumLength =
@@ -109,14 +109,14 @@ namespace path_view_openat_example
109109
if constexpr(is_same_v<type, char>)
110110
{
111111
// Render to the system narrow encoding null terminated
112-
auto zpath = path.render_null_terminated<char>(path);
112+
auto zpath = path.render_null_terminated<char>();
113113
return CreateFileA(zpath.c_str(), access, share, nullptr, creation,
114114
flags, nullptr);
115115
}
116116
else // char8_t, char16_t, wchar_t
117117
{
118118
// Render to the system wide encoding null terminated
119-
auto zpath = path.render_null_terminated<wchar_t>(path);
119+
auto zpath = path.render_null_terminated<wchar_t>();
120120
return CreateFileW(zpath.c_str(), access, share, nullptr, creation,
121121
flags, nullptr);
122122
}

include/llfio/v2.0/path_view.hpp

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1563,21 +1563,19 @@ class LLFIO_DECL path_view_component
15631563
LLFIO_TREQUIRES(LLFIO_TPRED(is_source_acceptable<T>),
15641564
LLFIO_TEXPR(std::is_constructible<rendered_path<zero_termination::zero_terminated, T, AllocatorOrDeleter, _internal_buffer_size>,
15651565
path_view_component, Args...>::value))
1566-
rendered_path<zero_termination::zero_terminated, T, AllocatorOrDeleter, _internal_buffer_size> render_null_terminated(path_view_component view,
1567-
Args &&...args) const
1566+
rendered_path<zero_termination::zero_terminated, T, AllocatorOrDeleter, _internal_buffer_size> render_null_terminated(Args &&...args) const
15681567
{
1569-
return rendered_path<zero_termination::zero_terminated, T, AllocatorOrDeleter, _internal_buffer_size>(view, std::forward<Args>(args)...);
1568+
return rendered_path<zero_termination::zero_terminated, T, AllocatorOrDeleter, _internal_buffer_size>(*this, std::forward<Args>(args)...);
15701569
}
15711570
//! Convenience function
15721571
LLFIO_TEMPLATE(class T = typename filesystem::path::value_type, class AllocatorOrDeleter = default_rendered_path_deleter<T[]>,
15731572
size_t _internal_buffer_size = default_internal_buffer_size, class... Args)
15741573
LLFIO_TREQUIRES(LLFIO_TPRED(is_source_acceptable<T>),
15751574
LLFIO_TEXPR(std::is_constructible<rendered_path<zero_termination::zero_terminated, T, AllocatorOrDeleter, _internal_buffer_size>,
15761575
path_view_component, Args...>::value))
1577-
rendered_path<zero_termination::not_zero_terminated, T, AllocatorOrDeleter, _internal_buffer_size> render_unterminated(path_view_component view,
1578-
Args &&...args) const
1576+
rendered_path<zero_termination::not_zero_terminated, T, AllocatorOrDeleter, _internal_buffer_size> render_unterminated(Args &&...args) const
15791577
{
1580-
return rendered_path<zero_termination::not_zero_terminated, T, AllocatorOrDeleter, _internal_buffer_size>(view, std::forward<Args>(args)...);
1578+
return rendered_path<zero_termination::not_zero_terminated, T, AllocatorOrDeleter, _internal_buffer_size>(*this, std::forward<Args>(args)...);
15811579
}
15821580

15831581
#ifdef __cpp_concepts

0 commit comments

Comments
 (0)