Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

typed data segment: fix vector handler for custom allocators #204

Merged
merged 1 commit into from
Jul 5, 2023
+6 −6
Merged

typed data segment: fix vector handler for custom allocators #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ workflows:
- build-gcc
oid_test_args: "-ftyped-data-segment"
tests_regex: "OidIntegration\\..*"
exclude_regex: ".*inheritance_polymorphic.*|.*std_vector_del_allocator_a|.*cycles_.*"
exclude_regex: ".*inheritance_polymorphic.*|.*cycles_.*"
- coverage:
name: coverage
requires:
Expand All @@ -37,7 +37,7 @@ workflows:
requires:
- test-type-graph-gcc
- coverage:
name: coverage-typed-data-sgement
name: coverage-typed-data-segment
requires:
- test-typed-data-segment-gcc

Expand Down
8 changes: 4 additions & 4 deletions types/seq_type.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,17 @@ void getSizeType(const %1%<T, Allocator> &container, size_t& returnArg)
"""

handler = """
template <typename DB, typename T0>
struct TypeHandler<DB, %1% <T0>> {
template <typename DB, typename T0, typename T1>
struct TypeHandler<DB, %1%<T0, T1>> {
using type = types::st::Pair<
DB, types::st::VarInt<DB>,
types::st::Pair<
DB, types::st::VarInt<DB>,
types::st::List<DB, typename TypeHandler<DB, T0>::type>>>;
static types::st::Unit<DB> getSizeType(
const %1% <T0> & container,
typename TypeHandler<DB, %1% <T0>>::type returnArg) {
const %1%<T0, T1> & container,
typename TypeHandler<DB, %1%<T0, T1>>::type returnArg) {
auto tail = returnArg.write((uintptr_t)&container)
.write(container.capacity())
.write(container.size());
Expand Down