Skip to content

Commit

Permalink
clang-format
Browse files Browse the repository at this point in the history
  • Loading branch information
d-frey committed Apr 13, 2024
1 parent ab9d785 commit ad320d6
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion include/tao/json/basic_value.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ namespace tao::json
return v;
}

basic_value& operator=( basic_value v ) noexcept( std::is_nothrow_move_assignable_v< variant_t >&& std::is_nothrow_move_assignable_v< public_base_t > )
basic_value& operator=( basic_value v ) noexcept( std::is_nothrow_move_assignable_v< variant_t > && std::is_nothrow_move_assignable_v< public_base_t > )
{
m_variant = std::move( v.m_variant );
public_base_t::operator=( static_cast< public_base_t&& >( v ) );
Expand Down
4 changes: 2 additions & 2 deletions include/tao/json/msgpack/events/to_stream.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ namespace tao::json::msgpack::events
void element() noexcept
{}

void end_array() // NOLINT(readability-convert-member-functions-to-static)
void end_array() // NOLINT(readability-convert-member-functions-to-static)
{
assert( false ); // LCOV_EXCL_LINE
}
Expand Down Expand Up @@ -196,7 +196,7 @@ namespace tao::json::msgpack::events
void member() noexcept
{}

void end_object() // NOLINT(readability-convert-member-functions-to-static)
void end_object() // NOLINT(readability-convert-member-functions-to-static)
{
assert( false ); // LCOV_EXCL_LINE
}
Expand Down
2 changes: 1 addition & 1 deletion src/test/json/json_parse.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ namespace tao::json
TEST_ASSERT( custom_from_string( "\"f\177o\"" ) == value( "f\177o" ) );

// TODO: This is sometimes allowed to allow embedded null-bytes within a null-terminated string. (Modified UTF-8)
TEST_THROWS( custom_from_string( "\"f\300\200o\"" ) ); // Codepoint 0x00 as 2 byte UTF-8 - overlong encoding.
TEST_THROWS( custom_from_string( "\"f\300\200o\"" ) ); // Codepoint 0x00 as 2 byte UTF-8 - overlong encoding.

TEST_THROWS( custom_from_string( "\"f\300\201o\"" ) ); // Codepoint 0x01 as 2 byte UTF-8 - overlong encoding.
TEST_THROWS( custom_from_string( "\"f\340\200\201o\"" ) ); // Codepoint 0x01 as 3 byte UTF-8 - overlong encoding.
Expand Down
3 changes: 2 additions & 1 deletion src/test/json/make_events.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,8 @@ namespace tao::json::test
}
{
// TODO: More numbers...
} {
}
{
c.string( "" );
c.element();
}
Expand Down

0 comments on commit ad320d6

Please sign in to comment.