thelilfrog/maddy
1
0
Fork 0
mirror of https://github.com/progsource/maddy.git synced 2026-03-25 16:00:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #45 from Ivansstyle/fix_version_define

Browse Source 
Refactored version() function in Parser class due to clashes with #define VERSION in various projects
This commit is contained in:
Petra Baranski
2023-08-01 18:38:12 +02:00
committed by GitHub
parent cc7f95f4c1 4656252374
commit 09229aae0d
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@@ -10,3 +10,4 @@ Martin Kopecky (martin.kopecky357@gmail.com)
Andrew Mettlach (dmmettlach@gmail.com) Andrew Mettlach (dmmettlach@gmail.com)
Evan Klitzke (evan@eklitzke.org) Evan Klitzke (evan@eklitzke.org)
Albert Schwarzkopf (dev-maddy@quitesimple.org) Albert Schwarzkopf (dev-maddy@quitesimple.org)
Ivans Saponenko (ivans.saponenko+maddy@gmail.com)

2
CHANGELOG.md
View File

@@ -14,7 +14,7 @@ maddy uses [semver versioning](https://semver.org/).
## Upcoming ## 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 ## version 1.2.0 2023-07-27

2
include/maddy/parser.h
View File

@@ -57,7 +57,7 @@ public:
* Check https://github.com/progsource/maddy/blob/master/CHANGELOG.md * Check https://github.com/progsource/maddy/blob/master/CHANGELOG.md
* for the changelog. * 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 * ctor