Commit 9db9c4b057647efe423650375dc1b56a57d8dabe - mozc

Fully qualify std:: for some STL functions part 4 No user-visible behavior change is intended. - Part 1: a110641de38bb7259f4c3990b31e458ac2b8a492 - Part 2: d71135ac28f2f8233247155a7b2a96389c41dd29 - Part 3: d64f60cfef9038418ae99a35057682067b4d5eec BUG=#324 TEST= REF_BUG=18587000 REF_CL=106194475 Yohei Yukawa 8 years ago

4 changed file(s) with 7 addition(s) and 7 deletion(s). Raw diff Collapse all Expand all

-1

src/mozc_version_template.txt less more

0	0	MAJOR=2
1	1	MINOR=17
2		BUILD=2363
	2	BUILD=2364
3	3	REVISION=102
4	4	# NACL_DICTIONARY_VERSION is the target version of the system dictionary to be
5	5	# downloaded by NaCl Mozc.

-3

src/prediction/dictionary_predictor.cc less more

1743	1743	for (size_t i = 0; i < result_rule->entries_size; ++i) {
1744	1744	const ZeroQueryEntry &entry = result_rule->entries[i];
1745	1745	if (entry.type != ZERO_QUERY_EMOJI) {
1746		results->push_back(make_pair(entry.value, entry.type));
	1746	results->push_back(std::make_pair(entry.value, entry.type));
1747	1747	continue;
1748	1748	}
1749	1749	if (available_emoji_carrier & Request::UNICODE_EMOJI &&
1750	1750	entry.emoji_type & EMOJI_UNICODE) {
1751		results->push_back(make_pair(entry.value, entry.type));
	1751	results->push_back(std::make_pair(entry.value, entry.type));
1752	1752	continue;
1753	1753	}
1754	1754

1760	1760	entry.emoji_type & EMOJI_KDDI)) {
1761	1761	string android_pua;
1762	1762	Util::UCS4ToUTF8(entry.emoji_android_pua, &android_pua);
1763		results->push_back(make_pair(android_pua, entry.type));
	1763	results->push_back(std::make_pair(android_pua, entry.type));
1764	1764	}
1765	1765	}
1766	1766	return !results->empty();

-2

src/session/internal/keymap.cc less more

122	122	const string filename = ConfigFileStream::GetFileName(keymap_file);
123	123	OutputFileStream ofs(filename.c_str());
124	124	if (ofs) {
125		ofs << "# This is a copy of keymap table for debugging." << endl;
126		ofs << "# Nothing happens when you edit this file manually." << endl;
	125	ofs << "# This is a copy of keymap table for debugging." << std::endl;
	126	ofs << "# Nothing happens when you edit this file manually." << std::endl;
127	127	ofs << custom_keymap_table;
128	128	}
129	129	#endif

-1

src/session/internal/keymap_factory.cc less more

54	54
55	55	// create new instance
56	56	KeyMapManager *manager = pool_.Alloc();
57		keymaps_.insert(make_pair(keymap, manager));
	57	keymaps_.insert(std::make_pair(keymap, manager));
58	58	manager->Initialize(keymap);
59	59	return manager;
60	60	}