From 9bcb7ce6dd5645eef7115e71ffd375a1bad382cf Mon Sep 17 00:00:00 2001 From: Ivans Saponenko Date: Tue, 1 Aug 2023 11:19:31 +0300 Subject: [PATCH 1/2] Refactored version() function in Parser class due to clashes with defines --- include/maddy/parser.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/maddy/parser.h b/include/maddy/parser.h index e1891bc..42cae89 100644 --- a/include/maddy/parser.h +++ b/include/maddy/parser.h @@ -57,7 +57,7 @@ public: * Check https://github.com/progsource/maddy/blob/master/CHANGELOG.md * for the changelog. */ - static const std::string VERSION() { static const std::string v = "1.2.0"; return v; } + static const std::string version() { static const std::string v = "1.2.0"; return v; } /** * ctor From 46562523741cb321c951cf09f5d6a1ef8a4181a6 Mon Sep 17 00:00:00 2001 From: Ivans Saponenko Date: Tue, 1 Aug 2023 11:42:42 +0300 Subject: [PATCH 2/2] Edit branch due to Contribution Guidelines --- AUTHORS | 1 + CHANGELOG.md | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index 9692835..04e0cc0 100644 --- a/AUTHORS +++ b/AUTHORS @@ -10,3 +10,4 @@ Martin Kopecky (martin.kopecky357@gmail.com) Andrew Mettlach (dmmettlach@gmail.com) Evan Klitzke (evan@eklitzke.org) Albert Schwarzkopf (dev-maddy@quitesimple.org) +Ivans Saponenko (ivans.saponenko+maddy@gmail.com) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2834039..aa07fe9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,7 @@ maddy uses [semver versioning](https://semver.org/). ## Upcoming -* ? +* ![**FIXED**](https://img.shields.io/badge/-FIXED-%23090) Parser.h version() method clashing with VERSION defines at global scope ## version 1.2.0 2023-07-27