diff options
| author | A. Wilcox <awilcox@wilcox-tech.com> | 2020-02-06 12:00:47 +0000 |
|---|---|---|
| committer | A. Wilcox <awilcox@wilcox-tech.com> | 2020-02-06 12:00:47 +0000 |
| commit | 41daf47e201a1088efd6cb9071465aed0fff6907 (patch) | |
| tree | 371421dbc3c11e203a80fb1ebaa5bb7fbab7906f /user/libixion/nullptr.patch | |
| parent | 204843f672d41ab08c1ede03eaa5f032691bfdb3 (diff) | |
| parent | 00075f842380bff25a1b88a27056973d0341fb31 (diff) | |
| download | packages-41daf47e201a1088efd6cb9071465aed0fff6907.tar.gz packages-41daf47e201a1088efd6cb9071465aed0fff6907.tar.bz2 packages-41daf47e201a1088efd6cb9071465aed0fff6907.tar.xz packages-41daf47e201a1088efd6cb9071465aed0fff6907.zip | |
Merge branch 'libreoffice' into 'master'
Bump LibreOffice to 6.4.0.3
See merge request adelie/packages!334
Diffstat (limited to 'user/libixion/nullptr.patch')
| -rw-r--r-- | user/libixion/nullptr.patch | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/user/libixion/nullptr.patch b/user/libixion/nullptr.patch new file mode 100644 index 000000000..27540bf30 --- /dev/null +++ b/user/libixion/nullptr.patch @@ -0,0 +1,25 @@ +From a8fe2c542b16ee30723ab3d7f3b643ee479e9723 Mon Sep 17 00:00:00 2001 +From: orbea <orbea@riseup.net> +Date: Fri, 23 Aug 2019 08:50:28 -0700 +Subject: [PATCH] Fix build with clang. + +--- + include/ixion/model_context.hpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/ixion/model_context.hpp b/include/ixion/model_context.hpp +index 6ff5b678..dc27ed03 100644 +--- a/include/ixion/model_context.hpp ++++ b/include/ixion/model_context.hpp +@@ -61,7 +61,7 @@ public: + } value; + + /** 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. */ +-- +2.22.0 + |