svn commit: r478668 - head/science/crf++/files
Tobias Kortkamp
tobik at FreeBSD.org
Sat Sep 1 10:29:12 UTC 2018
Author: tobik
Date: Sat Sep 1 10:29:11 2018
New Revision: 478668
URL: https://svnweb.freebsd.org/changeset/ports/478668
Log:
science/crf++: Fix build with Clang 6
feature_index.cpp:174:22: error: no matching function for call to 'make_pair'
old2new.insert(std::make_pair<int, int>(it->second.first, new_maxid));
^~~~~~~~~~~~~~~~~~~~~~~~
http://beefy11.nyi.freebsd.org/data/head-i386-default/p478276_s338342/logs/errors/crf++-0.54_1.log
Added:
head/science/crf++/files/
head/science/crf++/files/patch-feature__index.cpp (contents, props changed)
Added: head/science/crf++/files/patch-feature__index.cpp
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/science/crf++/files/patch-feature__index.cpp Sat Sep 1 10:29:11 2018 (r478668)
@@ -0,0 +1,21 @@
+--- feature_index.cpp.orig 2018-09-01 10:26:57 UTC
++++ feature_index.cpp
+@@ -34,8 +34,7 @@ int EncoderFeatureIndex::getID(const char *key) {
+ std::map <std::string, std::pair<int, unsigned int> >::iterator
+ it = dic_.find(key);
+ if (it == dic_.end()) {
+- dic_.insert(std::make_pair<std::string, std::pair<int, unsigned int> >
+- (key, std::make_pair<int, unsigned int>(maxid_, 1)));
++ dic_.insert(std::make_pair(key, std::make_pair(maxid_, 1)));
+ int n = maxid_;
+ maxid_ += (key[0] == 'U' ? y_.size() : y_.size() * y_.size());
+ return n;
+@@ -171,7 +170,7 @@ void EncoderFeatureIndex::shrink(size_t freq) {
+ const std::string &key = it->first;
+
+ if (it->second.second >= freq) {
+- old2new.insert(std::make_pair<int, int>(it->second.first, new_maxid));
++ old2new.insert(std::make_pair(it->second.first, new_maxid));
+ it->second.first = new_maxid;
+ new_maxid += (key[0] == 'U' ? y_.size() : y_.size() * y_.size());
+ ++it;
More information about the svn-ports-head
mailing list