typed data segment: fix vector handler for custom allocators

facebookexperimental · Jul 5, 2023 · 8f77da9 · 8f77da9
1 parent b1e98dd
commit 8f77da9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -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:
@@ -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
 

diff --git a/types/seq_type.toml b/types/seq_type.toml
@@ -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());