Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 2 additions & 25 deletions .github/workflows/ci_ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
matrix:
cpp_version: [ 17, 20 ]
build_type: [ Debug, Release ]
except_type: [ exceptions_on, exceptions_off ]
except_type: [ exceptions_on, exceptions_off ]
os: [ ubuntu-20.04, ubuntu-22.04 ]
toolset: [ g++-9, g++-10, g++-11, g++-12, clang++-8, clang++-9, clang++-10, clang++-11, clang++-12, clang++-13, clang++-14, clang++-15, clang++-16, clang++-17 ]
exclude:
Expand Down Expand Up @@ -163,27 +163,4 @@ jobs:
ulimit -c unlimited
ulimit -c
sudo sysctl -w kernel.core_pattern=core.%e.%p
ctest -C ${{ matrix.build_type }} -j2 -VV --timeout 1200 --test-dir build/
# - name: Fuzzing
# if: matrix.toolset == 'clang++-13'
# run: |
# echo "CXXFLAGS='-stdlib=libstdc++'" >> $GITHUB_ENV
# ulimit -c unlimited
# cmake --build build/ --target daw_json_fuzzing
# ./build/tests/daw_json_fuzzing -max_len=4000 -max_total_time=120
- name: Archive any crashes as an artifact
uses: actions/upload-artifact@v4
if: always( )
with:
name: crashes
path: |
crash-*
leak-*
timeout-*
build/core*
core*
/var/lib/systemd/coredump/*
/var/crash/*
!/var/crash/_usr_bin_do-release*
!/var/crash/_usr_lib_*
if-no-files-found: ignore
ctest -C ${{ matrix.build_type }} -j2 -VV --timeout 1200 --test-dir build/
5 changes: 2 additions & 3 deletions include/daw/json/daw_json_event_parser.h
Original file line number Diff line number Diff line change
Expand Up @@ -536,16 +536,15 @@ namespace daw::json {
options::parse_flags_t<ParseFlags...> pflags ) {

return json_event_parser<StackContainerPolicy>(
basic_json_value( json_document ), DAW_FWD2( Handler, handler ),
pflags );
basic_json_value( json_document ), DAW_FWD( handler ), pflags );
}

template<typename StackContainerPolicy = use_default, typename Handler>
DAW_ATTRIB_INLINE void json_event_parser( daw::string_view json_document,
Handler &&handler ) {

return json_event_parser<StackContainerPolicy>(
basic_json_value( json_document ), DAW_FWD2( Handler, handler ),
basic_json_value( json_document ), DAW_FWD( handler ),
options::parse_flags<> );
}

Expand Down
5 changes: 3 additions & 2 deletions include/daw/json/daw_json_link_types.h
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ namespace daw::json {

template<typename... Ts>
explicit constexpr tuple_json_mapping( Ts &&...values )
: members{ DAW_FWD2( Ts, values )... } {}
: members{ DAW_FWD( values )... } {}
};

template<typename... Members>
Expand Down Expand Up @@ -997,7 +997,8 @@ namespace daw::json {
} // namespace json_base

/***
* Link to a basic variant type that has no more than one of each of string, boolean, number, class, or array.
* Link to a basic variant type that has no more than one of each of string,
* boolean, number, class, or array.
* @tparam Name name of JSON member to link to
* @tparam T type that has specialization of
* daw::json::json_data_contract
Expand Down
2 changes: 1 addition & 1 deletion include/daw/json/impl/daw_json_parse_common.h
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ namespace daw::json {
static_assert(
std::is_invocable_v<Constructor, Args...>,
"Unable to construct value with the supplied arguments" );
return Constructor{ }( DAW_FWD2( Args, args )... );
return Constructor{ }( DAW_FWD( args )... );
}
}

Expand Down
4 changes: 3 additions & 1 deletion tests/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

cmake_policy( SET CMP0065 NEW )
cmake_policy( SET CMP0156 NEW )
cmake_policy( SET CMP0179 NEW )
if( POLICY CMP0179 )
cmake_policy( SET CMP0179 NEW )
endif()
cmake_policy( SET CMP0167 NEW )

set( CMAKE_CXX_STANDARD_REQUIRED ON )
Expand Down
Loading