From a8281f323ad01abfe1cb850eb9a46051a8ce7997 Mon Sep 17 00:00:00 2001 From: Martchus Date: Wed, 17 Jan 2024 14:34:30 +0100 Subject: [PATCH] Fix consistency issue when declaring/defining field mapping array --- cli/fieldmapping.cpp | 4 ++-- cli/fieldmapping.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cli/fieldmapping.cpp b/cli/fieldmapping.cpp index 2ecf2ba..f6387ab 100644 --- a/cli/fieldmapping.cpp +++ b/cli/fieldmapping.cpp @@ -8,7 +8,7 @@ using namespace TagParser; namespace Cli { namespace FieldMapping { -static constexpr auto fieldMapping = std::array{ { +static constexpr auto fieldMapping = MappingType{ { { "Title", KnownField::Title }, { "Album", KnownField::Album }, { "Artist", KnownField::Artist }, @@ -143,7 +143,7 @@ TagParser::KnownField knownField(const char *fieldDenotation, std::size_t fieldD return KnownField::Invalid; } -const std::array &mapping() +const MappingType &mapping() { return fieldMapping; } diff --git a/cli/fieldmapping.h b/cli/fieldmapping.h index ebb6c5b..33a66b4 100644 --- a/cli/fieldmapping.h +++ b/cli/fieldmapping.h @@ -18,7 +18,8 @@ struct Mapping { const char *fieldDenotation(TagParser::KnownField knownField); TagParser::KnownField knownField(const char *fieldDenotation, std::size_t fieldDenotationSize); -const std::array &mapping(); +using MappingType = std::array; +const MappingType &mapping(); } // namespace FieldMapping } // namespace Cli