From 6ed778974da2cbb6b73ea66a5447d9512f6fa77b Mon Sep 17 00:00:00 2001 From: Matteo Bernardini Date: Wed, 1 Jan 2020 17:38:37 +0100 Subject: 20200101.2 global branch merge. Signed-off-by: Matteo Bernardini --- misc/zinnia/zinnia-fixes-gcc6-compile.patch | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 misc/zinnia/zinnia-fixes-gcc6-compile.patch (limited to 'misc/zinnia/zinnia-fixes-gcc6-compile.patch') diff --git a/misc/zinnia/zinnia-fixes-gcc6-compile.patch b/misc/zinnia/zinnia-fixes-gcc6-compile.patch new file mode 100644 index 0000000000..848f306edb --- /dev/null +++ b/misc/zinnia/zinnia-fixes-gcc6-compile.patch @@ -0,0 +1,22 @@ +Index: zinnia-0.06/trainer.cpp +=================================================================== +--- zinnia-0.06.orig/trainer.cpp ++++ zinnia-0.06/trainer.cpp +@@ -93,7 +93,7 @@ class TrainerImpl: public Trainer { + + public: + bool add(const Character &character) { +- const std::string y = character.value(); ++ std::string y = character.value(); + CHECK_FALSE(!y.empty()) << "input character is empty"; + Features features; + CHECK_FALSE(features.read(character)) << "cannot read character: " << y; +@@ -103,7 +103,7 @@ class TrainerImpl: public Trainer { + if (!fn) { + return false; + } +- x_.push_back(std::make_pair(y, fn)); ++ x_.push_back(std::make_pair(y, fn)); + return true; + } + -- cgit v1.2.3