mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-21 00:25:50 +00:00
Code Issues Releases Activity

science/crf++: Fix build with Clang 6

Browse Source 
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
This commit is contained in:
Tobias Kortkamp 2018-09-01 10:29:11 +00:00
parent 22fb65b135
commit 224f5e1ab3
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=478668
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
science/crf++/files/patch-feature__index.cpp Normal file
View File

@ -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;