svn commit: r459583 - head/japanese/zinnia/files

Antoine Brodin antoine at FreeBSD.org
Sun Jan 21 10:08:42 UTC 2018


Author: antoine
Date: Sun Jan 21 10:08:40 2018
New Revision: 459583
URL: https://svnweb.freebsd.org/changeset/ports/459583

Log:
  Fix build with clang 6
  
  trainer.cpp:106:18: error: no matching function for call to 'make_pair'
      x_.push_back(std::make_pair<std::string, FeatureNode *>(y, fn));
                   ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  
  PR:		224669
  Reported by:	pkg-fallout

Added:
  head/japanese/zinnia/files/
  head/japanese/zinnia/files/patch-trainer.cpp   (contents, props changed)

Added: head/japanese/zinnia/files/patch-trainer.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/japanese/zinnia/files/patch-trainer.cpp	Sun Jan 21 10:08:40 2018	(r459583)
@@ -0,0 +1,20 @@
+--- trainer.cpp.orig	2010-05-09 05:34:08 UTC
++++ 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;
+   }
+ 


More information about the svn-ports-all mailing list