Skip to content

Commit 608880e

Browse files
committed
typed data segment: fix vector handler for custom allocators
1 parent b574eb7 commit 608880e

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

.circleci/config.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ workflows:
2727
- build-gcc
2828
oid_test_args: "-ftyped-data-segment"
2929
tests_regex: "OidIntegration\\..*"
30-
exclude_regex: ".*inheritance_polymorphic.*|.*std_vector_del_allocator_a|.*cycles_.*"
30+
exclude_regex: ".*inheritance_polymorphic.*|.*cycles_.*"
3131
- coverage:
3232
name: coverage
3333
requires:
@@ -37,7 +37,7 @@ workflows:
3737
requires:
3838
- test-type-graph-gcc
3939
- coverage:
40-
name: coverage-typed-data-sgement
40+
name: coverage-typed-data-segment
4141
requires:
4242
- test-typed-data-segment-gcc
4343

types/seq_type.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,17 +36,17 @@ void getSizeType(const %1%<T, Allocator> &container, size_t& returnArg)
3636
"""
3737

3838
handler = """
39-
template <typename DB, typename T0>
40-
struct TypeHandler<DB, %1% <T0>> {
39+
template <typename DB, typename T0, typename T1>
40+
struct TypeHandler<DB, %1%<T0, T1>> {
4141
using type = types::st::Pair<
4242
DB, types::st::VarInt<DB>,
4343
types::st::Pair<
4444
DB, types::st::VarInt<DB>,
4545
types::st::List<DB, typename TypeHandler<DB, T0>::type>>>;
4646
4747
static types::st::Unit<DB> getSizeType(
48-
const %1% <T0> & container,
49-
typename TypeHandler<DB, %1% <T0>>::type returnArg) {
48+
const %1%<T0, T1> & container,
49+
typename TypeHandler<DB, %1%<T0, T1>>::type returnArg) {
5050
auto tail = returnArg.write((uintptr_t)&container)
5151
.write(container.capacity())
5252
.write(container.size());

0 commit comments

Comments
 (0)