diff --git a/CMakeLists.txt b/CMakeLists.txt index 0aa6ac2..e35cd94 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required(VERSION 3.20) include(cmake/color.cmake) -set(BLT_VERSION 0.20.1) +set(BLT_VERSION 0.20.2) set(BLT_TEST_VERSION 0.0.1) set(BLT_TARGET BLT) diff --git a/include/blt/meta/config_generator.h b/include/blt/meta/config_generator.h index 4598847..a86ca57 100644 --- a/include/blt/meta/config_generator.h +++ b/include/blt/meta/config_generator.h @@ -24,21 +24,21 @@ namespace blt { #define BLT_MAKE_VARIABLE(TYPE, NAME) \ - TYPE _##NAME{}; + TYPE NAME{}; -#define INTERNAL_BLT_MAKE_GETTER(TYPE, NAME) \ - TYPE& get_##NAME() { return _##NAME; } \ - const TYPE& get_##NAME() const { return _##NAME; } +#define BLT_INTERNAL_MAKE_GETTER(TYPE, NAME) \ + TYPE& get_##NAME() { return NAME; } \ + const TYPE& get_##NAME() const { return NAME; } -#define INTERNAL_BLT_MAKE_SETTER(TYPE, NAME) \ +#define BLT_INTERNAL_MAKE_GETTER(TYPE, NAME) \ auto& set_##NAME(const TYPE& new_##NAME) \ { \ - _##NAME = new_##NAME; \ + NAME = new_##NAME; \ return *this; \ } \ auto& set_##NAME(TYPE new_##NAME) \ { \ - _##NAME = std::move(new_##NAME); \ + NAME = std::move(new_##NAME); \ return *this; \ } @@ -46,13 +46,13 @@ namespace blt private: \ BLT_MAKE_VARIABLE(TYPE, NAME) \ public: \ - INTERNAL_BLT_MAKE_GETTER(TYPE, NAME) + BLT_INTERNAL_MAKE_GETTER(TYPE, NAME) #define BLT_MAKE_SETTER(TYPE, NAME) \ private: \ BLT_MAKE_VARIABLE(TYPE, NAME) \ public: \ - INTERNAL_BLT_MAKE_SETTER(TYPE, NAME) + BLT_INTERNAL_MAKE_GETTER(TYPE, NAME) #define BLT_MAKE_FRIEND(FRIEND) friend FRIEND; @@ -65,8 +65,8 @@ namespace blt private: \ BLT_MAKE_VARIABLE(TYPE, NAME) \ public: \ - INTERNAL_BLT_MAKE_GETTER(TYPE, NAME) \ - INTERNAL_BLT_MAKE_SETTER(TYPE, NAME) + BLT_INTERNAL_MAKE_GETTER(TYPE, NAME) \ + BLT_INTERNAL_MAKE_GETTER(TYPE, NAME) #define BLT_MAKE_CONFIG_TYPE(OBJECT, ...) \ class OBJECT { \ diff --git a/libraries/parallel-hashmap b/libraries/parallel-hashmap index 8a889d3..d88c5e1 160000 --- a/libraries/parallel-hashmap +++ b/libraries/parallel-hashmap @@ -1 +1 @@ -Subproject commit 8a889d3699b3c09ade435641fb034427f3fd12b6 +Subproject commit d88c5e15079047777b418132ece5879e7c9aaa2b