From 32bcc1f6cc46d35533dc66a42589e127e6fb3f32 Mon Sep 17 00:00:00 2001 From: Karl Robillard Date: Thu, 29 Feb 2024 18:51:54 -0500 Subject: [PATCH 1/4] dsc.h: Eliminate circular include of solvespace.h. --- src/dsc.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/dsc.h b/src/dsc.h index 19f08686b..bbb9b2c8c 100644 --- a/src/dsc.h +++ b/src/dsc.h @@ -7,8 +7,6 @@ #ifndef SOLVESPACE_DSC_H #define SOLVESPACE_DSC_H -#include "solvespace.h" - #include #include From 6e4d4517bb8fdfd42cf02b08bfbf2b046342d039 Mon Sep 17 00:00:00 2001 From: Karl Robillard Date: Thu, 29 Feb 2024 22:32:12 -0500 Subject: [PATCH 2/4] Update libdxfrw for DEBUG fix. --- extlib/libdxfrw | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extlib/libdxfrw b/extlib/libdxfrw index 0b7b7b709..fea9e0441 160000 --- a/extlib/libdxfrw +++ b/extlib/libdxfrw @@ -1 +1 @@ -Subproject commit 0b7b7b709d9299565db603f878214656ef5e9ddf +Subproject commit fea9e044114f6c301e5111d966a49f380498acb9 From 7b22cc1d78656321c473411e44583eab4cf90ceb Mon Sep 17 00:00:00 2001 From: Karl Robillard Date: Thu, 12 Dec 2024 22:57:10 -0500 Subject: [PATCH 3/4] clipboard.cpp: Fix GCC -Wimplicit-fallthrough= warning. --- src/clipboard.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/clipboard.cpp b/src/clipboard.cpp index 8b16481c7..4592a9209 100644 --- a/src/clipboard.cpp +++ b/src/clipboard.cpp @@ -285,6 +285,7 @@ void GraphicsWindow::PasteClipboard(Vector trans, double theta, double scale) { } break; } + // Fall through... case Constraint::Type::HORIZONTAL: case Constraint::Type::VERTICAL: // When rotating 90 or 270 degrees, swap the vertical / horizontal constraints From 5109b26277a86ecd74f7de625daf9811a0a5aef6 Mon Sep 17 00:00:00 2001 From: Karl Robillard Date: Sun, 15 Dec 2024 08:42:50 -0500 Subject: [PATCH 4/4] solvespace.h: Quiet std::iterator is deprecated warnings with C++17. --- src/solvespace.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/solvespace.h b/src/solvespace.h index 96e66ccf6..9aee5211c 100644 --- a/src/solvespace.h +++ b/src/solvespace.h @@ -179,9 +179,15 @@ enum class SolveResult : uint32_t { // Utility functions that are provided in the platform-independent code. -class utf8_iterator : std::iterator { +class utf8_iterator { const char *p, *n; public: + using iterator_category = std::forward_iterator_tag; + using value_type = char32_t; + using difference_type = std::ptrdiff_t; + using pointer = char32_t*; + using reference = char32_t&; + utf8_iterator(const char *p) : p(p), n(NULL) {} bool operator==(const utf8_iterator &i) const { return p==i.p; } bool operator!=(const utf8_iterator &i) const { return p!=i.p; }