Skip to content

Commit ae28401

Browse files
committed
Flips allocator / capacity policy template args
1 parent ccb30d1 commit ae28401

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

include/mf/multi_field_array.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@
2323
namespace mf
2424
{
2525

26-
template <typename... Ts, typename CapacityIncreasePolicy, typename AllocatorTs>
26+
template <typename... Ts, typename AllocatorTs, typename CapacityIncreasePolicy>
2727
class BasicMultiFieldArray<
2828
std::tuple<Ts...>,
29-
CapacityIncreasePolicy,
30-
BasicMultiAllocatorAdapter<std::tuple<Ts...>, AllocatorTs>>
29+
BasicMultiAllocatorAdapter<std::tuple<Ts...>, AllocatorTs>,
30+
CapacityIncreasePolicy>
3131
{
3232
public:
3333
/// Alias for multi-field allocator adapter
@@ -815,6 +815,6 @@ template <typename... FieldTs> using default_allocator_adapter = single_allocato
815815
*/
816816
template <typename... FieldTs>
817817
using multi_field_array =
818-
BasicMultiFieldArray<std::tuple<FieldTs...>, DefaultCapacityIncreasePolicy, default_allocator_adapter<FieldTs...>>;
818+
BasicMultiFieldArray<std::tuple<FieldTs...>, default_allocator_adapter<FieldTs...>, DefaultCapacityIncreasePolicy>;
819819

820820
} // namespace mf

include/mf/multi_field_array_fwd.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ namespace mf
88
{
99

1010
template <typename FieldTs> class View;
11-
template <typename FieldTs, typename CapacityIncreasePolicy, typename AllocatorAdapterT> class BasicMultiFieldArray;
11+
template <typename FieldTs, typename AllocatorAdapterT, typename CapacityIncreasePolicy> class BasicMultiFieldArray;
1212
template <typename ValueTs, typename AllocatorTs> class BasicMultiAllocatorAdapter;
1313

1414
} // namespace mf

test/multi_field_array.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -681,7 +681,7 @@ TEST(MultiFieldArray, CustomCapacityIncreasePolicy)
681681
};
682682

683683
using multi_field_array_type =
684-
mf::BasicMultiFieldArray<std::tuple<int>, CustomPolicy, mf::default_allocator_adapter<int>>;
684+
mf::BasicMultiFieldArray<std::tuple<int>, mf::default_allocator_adapter<int>, CustomPolicy>;
685685

686686
multi_field_array_type array;
687687

0 commit comments

Comments
 (0)