From 7a191f97ce0c222566973f9e18b43036844ecf3c Mon Sep 17 00:00:00 2001 From: HampusM Date: Sat, 11 Jun 2022 22:38:10 +0200 Subject: refactor!: simplify tagging --- examples/basic/src/bootstrap.cpp | 4 ++-- examples/basic/src/interfaces/enemy.hpp | 8 +++----- 2 files changed, 5 insertions(+), 7 deletions(-) (limited to 'examples/basic/src') diff --git a/examples/basic/src/bootstrap.cpp b/examples/basic/src/bootstrap.cpp index ac81bd9..78c5a37 100644 --- a/examples/basic/src/bootstrap.cpp +++ b/examples/basic/src/bootstrap.cpp @@ -27,7 +27,7 @@ auto bootstrap() -> yacppdic::Container return std::make_unique(65); } ) - .when_tagged(SMALL_ENEMY_TAG); + .when_tagged(); container.bind() .to_factory( @@ -36,7 +36,7 @@ auto bootstrap() -> yacppdic::Container return std::make_unique(130); } ) - .when_tagged(BIG_ENEMY_TAG); + .when_tagged(); return container; } diff --git a/examples/basic/src/interfaces/enemy.hpp b/examples/basic/src/interfaces/enemy.hpp index 5ad7d90..d0b6337 100644 --- a/examples/basic/src/interfaces/enemy.hpp +++ b/examples/basic/src/interfaces/enemy.hpp @@ -1,14 +1,12 @@ #pragma once #include +#include #include -// NOLINTNEXTLINE(modernize-avoid-c-arrays, cppcoreguidelines-avoid-c-arrays) -constexpr char SMALL_ENEMY_TAG[] = "small"; - -// NOLINTNEXTLINE(modernize-avoid-c-arrays, cppcoreguidelines-avoid-c-arrays) -constexpr char BIG_ENEMY_TAG[] = "big"; +constexpr yacppdic::Tag SMALL_ENEMY_TAG = "small"; +constexpr yacppdic::Tag BIG_ENEMY_TAG = "big"; // NOLINTNEXTLINE(cppcoreguidelines-special-member-functions) class IEnemy -- cgit v1.2.3-18-g5258