Skip to content

Commit 5a70b27

Browse files
committed
Merge branch 'master' of https://github.com/danielaparker/jsoncons into json_tokenizer_cursor
2 parents a802135 + 2d50086 commit 5a70b27

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

.github/workflows/cifuzz.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121
dry-run: false
2222
language: c++
2323
- name: Upload Crash
24-
uses: actions/upload-artifact@v5
24+
uses: actions/upload-artifact@v6
2525
if: failure() && steps.build.outcome == 'success'
2626
with:
2727
name: artifacts

include/jsoncons/basic_json.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1765,7 +1765,7 @@ namespace jsoncons {
17651765
{
17661766
return -1;
17671767
}
1768-
if (val2 >= 0 && val2 < 0)
1768+
if (val2 < 0 && val1 >= 0)
17691769
{
17701770
return 1;
17711771
}

include/jsoncons/reflect/reflect_traits_gen.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ void set_member(T&&, const U&)
6262
template <typename T, typename U>
6363
void set_member(T&& val, U& result)
6464
{
65-
result = std::move(val);
65+
result = std::forward<T>(val);
6666
}
6767

6868
template <typename Json>

include/jsoncons/utility/uri.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ namespace jsoncons {
162162
*this = parse(str, ec);
163163
if (JSONCONS_UNLIKELY(ec))
164164
{
165-
JSONCONS_THROW(std::system_error(ec));
165+
JSONCONS_THROW(std::system_error(ec, std::string(str)));
166166
}
167167
}
168168

@@ -213,7 +213,7 @@ namespace jsoncons {
213213
{
214214
if (!validate_port(port))
215215
{
216-
JSONCONS_THROW(std::system_error(uri_errc::invalid_port));
216+
JSONCONS_THROW(std::system_error(uri_errc::invalid_port, std::string(port)));
217217
}
218218

219219
uri_string_.append(":");

0 commit comments

Comments
 (0)