diff options
| author |   zaaarf <80046572+zaaarf@users.noreply.github.com> | 2023-12-01 23:31:41 +0100 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2023-12-01 23:31:41 +0100 |
| commit | 0de3d5849cfb9faad0e3c8ce10a8152a916bba21 (patch) | |
| tree | 7138640edd95f468115f2732e45c86ae5181d7f7 /src/openvic-simulation/utility | |
| parent | a54898b7770e0d66b729216173960686c67e58bb (diff) | |
| parent | 76ddf81044f9ff63e82fc188c0d6aac9616228ce (diff) | |
Merge pull request #81 from OpenVicProject/dataloading-rebels
Dataloading rebels
Diffstat (limited to 'src/openvic-simulation/utility')
| -rw-r--r-- | src/openvic-simulation/utility/Getters.hpp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/openvic-simulation/utility/Getters.hpp b/src/openvic-simulation/utility/Getters.hpp index 99c895c..1be9287 100644 --- a/src/openvic-simulation/utility/Getters.hpp +++ b/src/openvic-simulation/utility/Getters.hpp @@ -36,13 +36,17 @@ constexpr std::string_view get_base_type() const override { \ return ::ovdl::detail::type_name<std::decay_t<decltype(*this)>>(); } -#define REF_GETTERS(var) \ - constexpr decltype(var)& get_##var() { \ - return var; \ +#define PROPERTY_REF(NAME) PROPERTY_REF_FULL(NAME, private) +#define PROPERTY_REF_FULL(NAME, ACCESS) \ + NAME; \ +public: \ + constexpr decltype(NAME)& get_##NAME() { \ + return NAME; \ } \ - constexpr decltype(var) const& get_##var() const { \ - return var; \ - } + constexpr decltype(NAME) const& get_##NAME() const { \ + return NAME; \ + } \ +ACCESS: namespace OpenVic { struct ReturnByValueProperty {}; @@ -88,6 +92,7 @@ namespace OpenVic { * Province& PROPERTY(province); // Province& province; Province const& get_province() const; */ #define PROPERTY(NAME) PROPERTY_ACCESS(NAME, private) +#define PROPERTY_CUSTOM_PREFIX(NAME, PREFIX) PROPERTY_CUSTOM_NAME(NAME, PREFIX##_##NAME) #define PROPERTY_CUSTOM_NAME(NAME, GETTER_NAME) PROPERTY_FULL(NAME, GETTER_NAME, private) #define PROPERTY_ACCESS(NAME, ACCESS) PROPERTY_FULL(NAME, get_##NAME, ACCESS) #define PROPERTY_FULL(NAME, GETTER_NAME, ACCESS) \ |