Skip to content

Commit

Permalink
Revert "Trying to work around a strange merge conflict"
Browse files Browse the repository at this point in the history
This reverts commit 71a2b79.
  • Loading branch information
hsutter committed Dec 3, 2023
1 parent 71a2b79 commit aa611ba
Showing 1 changed file with 0 additions and 12 deletions.
12 changes: 0 additions & 12 deletions source/reflect.h
Original file line number Diff line number Diff line change
Expand Up @@ -771,19 +771,7 @@ namespace meta {

auto add_line {[&, _1 = lines](cpp2::in<std::string_view> s) mutable -> void{
static_cast<void>(CPP2_UFCS(emplace_back)((*cpp2::assert_not_null(_1)), s, source_line::category::cpp2));
}};



/*
auto add_line {[&, _1 = lines](cpp2::in<std::string_view> s) mutable -> void{
static_cast<void>(CPP2_UFCS(emplace_back, (*cpp2::assert_not_null(_1)), s, source_line::category::cpp2));
}};
*/



}};
{
auto newline_pos = CPP2_UFCS(find)(source, '\n');

Expand Down

0 comments on commit aa611ba

Please sign in to comment.