aboutsummaryrefslogtreecommitdiffstats
path: root/community/libixion/fix-nullptr_t.patch
diff options
context:
space:
mode:
Diffstat (limited to 'community/libixion/fix-nullptr_t.patch')
-rw-r--r--community/libixion/fix-nullptr_t.patch32
1 files changed, 16 insertions, 16 deletions
diff --git a/community/libixion/fix-nullptr_t.patch b/community/libixion/fix-nullptr_t.patch
index b7ab049894..d426ca2a82 100644
--- a/community/libixion/fix-nullptr_t.patch
+++ b/community/libixion/fix-nullptr_t.patch
@@ -1,25 +1,25 @@
-From a8fe2c542b16ee30723ab3d7f3b643ee479e9723 Mon Sep 17 00:00:00 2001
+From 1992b8ab9c7765b8da06b6054bb3c0ab990c62f7 Mon Sep 17 00:00:00 2001
From: orbea <orbea@riseup.net>
-Date: Fri, 23 Aug 2019 08:50:28 -0700
+Date: Wed, 28 Oct 2020 08:13:31 -0700
Subject: [PATCH] Fix build with clang.
---
- include/ixion/model_context.hpp | 2 +-
+ src/libixion/model_context.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/include/ixion/model_context.hpp b/include/ixion/model_context.hpp
-index 6ff5b67..dc27ed0 100644
---- a/include/ixion/model_context.hpp
-+++ b/include/ixion/model_context.hpp
-@@ -61,7 +61,7 @@ public:
- } value;
+diff --git a/src/libixion/model_context.cpp b/src/libixion/model_context.cpp
+index 0fcbb31..f6eb3cf 100644
+--- a/src/libixion/model_context.cpp
++++ b/src/libixion/model_context.cpp
+@@ -17,7 +17,7 @@
- /** Initializes the cell to be empty. */
-- input_cell(nullptr_t);
-+ input_cell(std::nullptr_t);
- /** Boolean cell value. */
- input_cell(bool b);
- /** The char array must be null-terminated. */
+ namespace ixion {
+
+-model_context::input_cell::input_cell(nullptr_t) : type(celltype_t::empty) {}
++model_context::input_cell::input_cell(std::nullptr_t) : type(celltype_t::empty) {}
+ model_context::input_cell::input_cell(bool b) : type(celltype_t::boolean)
+ {
+ value.boolean = b;
--
-2.24.1
+GitLab