diff options
| author | HampusM <hampus@hampusmat.com> | 2022-03-03 19:17:48 +0100 |
|---|---|---|
| committer | HampusM <hampus@hampusmat.com> | 2022-06-13 17:56:54 +0200 |
| commit | 70b21e90d7be4d892b7d17440d64630e7ee1a575 (patch) | |
| tree | 429e9038df3263b31e98df301d0a0c85671057fa /src/interfaces | |
| parent | c2f41a5b278df2837f4cc5617df07248a048d93c (diff) | |
refactor: improve factories
Diffstat (limited to 'src/interfaces')
| -rw-r--r-- | src/interfaces/bounds.hpp | 4 | ||||
| -rw-r--r-- | src/interfaces/matrix.hpp | 4 | ||||
| -rw-r--r-- | src/interfaces/randomization.hpp | 5 | ||||
| -rw-r--r-- | src/interfaces/vector2.hpp | 4 |
4 files changed, 5 insertions, 12 deletions
diff --git a/src/interfaces/bounds.hpp b/src/interfaces/bounds.hpp index 7e920cf..b431874 100644 --- a/src/interfaces/bounds.hpp +++ b/src/interfaces/bounds.hpp @@ -2,7 +2,6 @@ #include "interfaces/vector2.hpp" -#include <functional> #include <memory> enum CoordsValidation @@ -39,5 +38,4 @@ struct IBoundsOptions unsigned int height; }; -using IBoundsFactory = - std::function<std::shared_ptr<IBounds>(const IBoundsOptions &options)>; +using IBoundsFactory = std::shared_ptr<IBounds> (*)(const IBoundsOptions &options); diff --git a/src/interfaces/matrix.hpp b/src/interfaces/matrix.hpp index ab5f40b..72d18d9 100644 --- a/src/interfaces/matrix.hpp +++ b/src/interfaces/matrix.hpp @@ -3,7 +3,6 @@ #include "interfaces/bounds.hpp" #include "interfaces/vector2.hpp" -#include <functional> #include <memory> template <typename Element> @@ -46,5 +45,4 @@ public: }; template <typename Element> -using IMatrixFactory = - std::function<std::shared_ptr<IMatrix<Element>>(const IBounds &bounds)>; +using IMatrixFactory = std::shared_ptr<IMatrix<Element>> (*)(const IBounds &bounds); diff --git a/src/interfaces/randomization.hpp b/src/interfaces/randomization.hpp index 9eeec0a..12f6486 100644 --- a/src/interfaces/randomization.hpp +++ b/src/interfaces/randomization.hpp @@ -1,6 +1,5 @@ #pragma once -#include <functional> #include <memory> class ISeedGenerator @@ -11,7 +10,7 @@ public: [[nodiscard]] virtual unsigned int random_seed() const = 0; }; -using ISeedGeneratorFactory = std::function<std::shared_ptr<ISeedGenerator>()>; +using ISeedGeneratorFactory = std::shared_ptr<ISeedGenerator> (*)(); /** * Pseudo-random unsigned integer generator. @@ -32,4 +31,4 @@ public: }; using IRandomNumberGeneratorFactory = - std::function<std::shared_ptr<IRandomNumberGenerator>(const unsigned int &seed)>; + std::shared_ptr<IRandomNumberGenerator> (*)(const unsigned int &seed); diff --git a/src/interfaces/vector2.hpp b/src/interfaces/vector2.hpp index 569dc30..dfd369f 100644 --- a/src/interfaces/vector2.hpp +++ b/src/interfaces/vector2.hpp @@ -1,6 +1,5 @@ #pragma once -#include <functional> #include <memory> class IVector2 @@ -42,5 +41,4 @@ struct IVector2Options unsigned int y; }; -using IVector2Factory = - std::function<std::shared_ptr<IVector2>(const IVector2Options &options)>; +using IVector2Factory = std::shared_ptr<IVector2> (*)(const IVector2Options &options); |