diff options
| author | rene <rene@FreeBSD.org> | 2018-11-02 21:40:24 +0800 |
|---|---|---|
| committer | rene <rene@FreeBSD.org> | 2018-11-02 21:40:24 +0800 |
| commit | e745ed32d7b6cef7c428075b64a75abb6cbd6de7 (patch) | |
| tree | 810984732ff2bcc7b406242348f683d67df254c2 /print/lyx | |
| parent | abe85598b76e65884f63f5d35b14a7a5837c77ee (diff) | |
| download | freebsd-ports-gnome-e745ed32d7b6cef7c428075b64a75abb6cbd6de7.tar.gz freebsd-ports-gnome-e745ed32d7b6cef7c428075b64a75abb6cbd6de7.tar.zst freebsd-ports-gnome-e745ed32d7b6cef7c428075b64a75abb6cbd6de7.zip | |
Followup on r483807.
jbeich commented on some ports in D17724 but I forgot to add them to the list.
Submitted by: rene
Reviewed by: bapt, jbeich
Differential Revision: https://reviews.freebsd.org/D17724
Diffstat (limited to 'print/lyx')
| -rw-r--r-- | print/lyx/files/patch-src_TexRow.cpp | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/print/lyx/files/patch-src_TexRow.cpp b/print/lyx/files/patch-src_TexRow.cpp deleted file mode 100644 index 74669e97c592..000000000000 --- a/print/lyx/files/patch-src_TexRow.cpp +++ /dev/null @@ -1,39 +0,0 @@ -Fixes the build on 10.4 with clang 3.4.1. - - TexRow.cpp:271:6: error: return type 'const TexRow::TextEntry' must match previous return type 'TexRow::TextEntry' when lambda expression has unspecified explicit return type - return text_none; - ^ - TexRow.cpp:273:3: error: return type 'const TexRow::TextEntry' must match previous return type 'TexRow::TextEntry' when lambda expression has unspecified explicit return type - return text_none; - ^ - TexRow.cpp:288:6: error: return type 'lyx::TexRow::TextEntry' must match previous return type 'const TexRow::TextEntry' when lambda expression has unspecified explicit return type - return last_pos; - ^ - TexRow.cpp:290:6: error: return type 'struct TextEntry' must match previous return type 'const TexRow::TextEntry' when lambda expression has unspecified explicit return type - return entry.text; - ^ - TexRow.cpp:293:3: error: return type 'lyx::TexRow::TextEntry' must match previous return type 'const TexRow::TextEntry' when lambda expression has unspecified explicit return type - return last_pos; - ^ - -Not upstreamable, this seems to be a workaround for a compiler bug. ---- src/TexRow.cpp.orig 2018-02-25 00:11:18 UTC -+++ src/TexRow.cpp -@@ -260,7 +260,7 @@ TexRow::getEntriesFromRow(int const row) const - return {text_none, text_none}; - - // find the start entry -- TextEntry const start = [&]() { -+ TextEntry const start = [&]() -> TextEntry const { - for (size_t j = i; j > 0; --j) { - if (!isNone(rowlist_[j].getTextEntry())) - return rowlist_[j].getTextEntry(); -@@ -274,7 +274,7 @@ TexRow::getEntriesFromRow(int const row) const - } (); - - // find the end entry -- TextEntry end = [&]() { -+ TextEntry end = [&]() -> TextEntry const { - if (isNone(start)) - return text_none; - // select up to the last position of the starting paragraph as a |