diff options
| author | FormerLurker <hochgebe@gmail.com> | 2021-02-04 22:39:36 +0300 |
|---|---|---|
| committer | FormerLurker <hochgebe@gmail.com> | 2021-02-04 22:39:36 +0300 |
| commit | 5e7920dea901011a9144d0cd3fbd7b78624b7d81 (patch) | |
| tree | 8e120b9e7e8038785a9b28f125e2a92837bce4a3 /GcodeProcessorLib | |
| parent | 11d11e4b7cc1eb28bf62ca9732b98521a80b05cc (diff) | |
Fix for issue #34.1.1.1
Diffstat (limited to 'GcodeProcessorLib')
| -rw-r--r-- | GcodeProcessorLib/array_list.h | 4 | ||||
| -rw-r--r-- | GcodeProcessorLib/version.h | 22 |
2 files changed, 13 insertions, 13 deletions
diff --git a/GcodeProcessorLib/array_list.h b/GcodeProcessorLib/array_list.h index e5aec2e..90e0cb5 100644 --- a/GcodeProcessorLib/array_list.h +++ b/GcodeProcessorLib/array_list.h @@ -64,7 +64,7 @@ public: inline int get_index_position(int index) const { - int index_position = index + front_index_ + max_size_; + int index_position = index + front_index_;// + max_size_; while (index_position >= max_size_) { index_position = index_position - max_size_; @@ -135,7 +135,7 @@ public: { throw std::exception(); } - int pos = get_index_position(count_); + int pos = get_index_position(count_-1); count_--; return items_[pos]; } diff --git a/GcodeProcessorLib/version.h b/GcodeProcessorLib/version.h index 5653329..d12d4ab 100644 --- a/GcodeProcessorLib/version.h +++ b/GcodeProcessorLib/version.h @@ -1,15 +1,15 @@ #ifndef VERSION_H -#define VERSION_H - #ifndef HAS_GENERATED_VERSION - #define GIT_BRANCH "Unknown" - #define GIT_COMMIT_HASH "Unknown" - #define GIT_TAGGED_VERSION "Unknown" - #define GIT_TAG "Unknown" - #define BUILD_DATE "Unknown" - #define COPYRIGHT_DATE "2020" - #define AUTHOR "Brad Hochgesang" + #define VERSION_H + #ifndef HAS_GENERATED_VERSION + #define VERSION_GENERATED_H + #define GIT_BRANCH "master" + #define GIT_COMMIT_HASH "11d11e4" + #define GIT_TAGGED_VERSION "1.1.0" + #define GIT_TAG "1.1.0" + #define BUILD_DATE "2021-01-24T20:44:10Z" + #define COPYRIGHT_DATE "2021" + #define AUTHOR "Brad Hochgesang" #else - #include "version.generated.h" - + #include "version.generated.h" #endif #endif
\ No newline at end of file |