c.length = std::atoi(col[3]);\r
c.default_type = id++;\r
\r
- category.insert(std::make_pair<std::string, CharInfo>(key, c));\r
+ category.insert(std::pair<std::string, CharInfo>(key, c));\r
category_ary.push_back(key);\r
}\r
}\r
token->wcost = cost;\r
token->feature = offset;\r
token->compound = 0;\r
- dic.push_back(std::make_pair<std::string, Token*>(w, token));\r
+ dic.push_back(std::pair<std::string, Token*>(w, token));\r
\r
// append to output buffer\r
if (!wakati) fbuf.append(key.data(), key.size());\r
f.ufeature = *ufeature;\r
f.lfeature = *lfeature;\r
f.rfeature = *rfeature;\r
- cache_.insert(std::make_pair<std::string, FeatureSet>(feature, f));\r
+ cache_.insert(std::pair<std::string, FeatureSet>(feature, f));\r
} else {\r
*ufeature = it->second.ufeature;\r
*lfeature = it->second.lfeature;\r
feature_cache_.insert(std::pair\r
<std::string, std::pair<const int *, size_t> >\r
(key,\r
- std::make_pair<const int *, size_t>\r
+ std::pair<const int *, size_t>\r
(path->rnode->fvector, 1)));\r
}\r
}\r
return false;\r
feature_cache_.insert(std::pair\r
<std::string, std::pair<const int *, size_t> >\r
- (key, std::make_pair<const int *, size_t>\r
+ (key, std::pair<const int *, size_t>\r
(path->fvector, 1)));\r
}\r
}\r
int EncoderFeatureIndex::id(const char *key) {\r
std::map<std::string, int>::const_iterator it = dic_.find(key);\r
if (it == dic_.end()) {\r
- dic_.insert(std::make_pair<std::string, int>(std::string(key), maxid_));\r
+ dic_.insert(std::pair<std::string, int>(std::string(key), maxid_));\r
return maxid_++;\r
} else {\r
return it->second;\r
std::map<int, int> old2new;\r
for (size_t i = 0; i < freqv.size(); ++i) {\r
if (freqv[i] >= freq)\r
- old2new.insert(std::make_pair<int, int>(i, maxid_++));\r
+ old2new.insert(std::pair<int, int>(i, maxid_++));\r
}\r
\r
// update dic_\r