slackbuilds/misc/zinnia/zinnia-fixes-gcc6-compile.p...

23 lines
753 B
Diff
Raw Normal View History

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<std::string, FeatureNode *>(y, fn));
+ x_.push_back(std::make_pair(y, fn));
return true;
}