Commit 37bb71a15cc03b698f6b3f6edcf0e2441dce8544 - mozc

Add std:: prefix for code refactoring BUG=#392 TEST=unittest REF_BUG=71969651 REF_CL=184478309 REF_TIME=2018-02-05T13:28:53+09:00 REF_TIME_RAW=1517804933 +0900 Hiroyuki Komatsu 6 years ago

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

-3

src/base/android_jni_mock.cc less more

70	70	}
71	71
72	72	void MockJNIEnv::ClearArrayMap() {
73		for (std::map<jbyteArray, pair<jsize, jbyte*> >::iterator iter =
	73	for (std::map<jbyteArray, std::pair<jsize, jbyte*> >::iterator iter =
74	74	byte_array_map_.begin();
75	75	iter != byte_array_map_.end(); ++iter) {
76	76	delete iter->first;

130	130	}
131	131
132	132	jsize MockJNIEnv::GetArrayLength(jarray array) {
133		map<jbyteArray, pair<jsize, jbyte*> >::iterator iter =
	133	std::map<jbyteArray, std::pair<jsize, jbyte*> >::iterator iter =
134	134	byte_array_map_.find(static_cast<jbyteArray>(array));
135	135	if (iter != byte_array_map_.end()) {
136	136	return iter->second.first;

139	139	}
140	140
141	141	jbyte MockJNIEnv::GetByteArrayElements(jbyteArray array, jboolean is_copy) {
142		map<jbyteArray, pair<jsize, jbyte*> >::iterator iter =
	142	std::map<jbyteArray, std::pair<jsize, jbyte*> >::iterator iter =
143	143	byte_array_map_.find(array);
144	144	if (iter != byte_array_map_.end()) {
145	145	if (is_copy) {

-1

src/base/android_jni_mock.h less more

104	104
105	105	private:
106	106	JNIEnv env_;
107		map<jbyteArray, pair<jsize, jbyte*> > byte_array_map_;
	107	std::map<jbyteArray, std::pair<jsize, jbyte*> > byte_array_map_;
108	108
109	109	// Http client's mock injecting point.
110	110	std::unique_ptr<MockJavaHttpClient> mock_http_client_;

-3

src/base/android_util.cc less more

40	40	} // namespace
41	41
42	42	namespace mozc {
43		map<string, string> AndroidUtil::property_cache;
44		set<string> AndroidUtil::undefined_keys;
	43	std::map<string, string> AndroidUtil::property_cache;
	44	std::set<string> AndroidUtil::undefined_keys;
45	45	const char AndroidUtil::kSystemPropertyOsVersion[] = "ro.build.version.release";
46	46	const char AndroidUtil::kSystemPropertyModel[] = "ro.product.model";
47	47	const char AndroidUtil::kSystemPropertySdkVersion[] = "ro.build.version.sdk";

50	50	string AndroidUtil::GetSystemProperty(const string &key,
51	51	const string &default_value) {
52	52	mozc::scoped_lock lock(&sys_prop_mutex);
53		map<string, string>::iterator it = property_cache.find(key);
	53	std::map<string, string>::iterator it = property_cache.find(key);
54	54	if (it != property_cache.end()) {
55	55	// Cache is found.
56	56	return it->second;

-3

src/config/stats_config_util_test.cc less more

115	115	usagestats_map_[key] = value;
116	116	}
117	117	DWORD get_entry_from_usagestats_map(HKEY key) const {
118		map<HKEY, DWORD>::const_iterator i = usagestats_map_.find(key);
	118	std::map<HKEY, DWORD>::const_iterator i = usagestats_map_.find(key);
119	119	if (i == usagestats_map_.end()) {
120	120	return 0;
121	121	}
122	122	return i->second;
123	123	}
124		map<HKEY, DWORD> & usagestats_map() const {
	124	std::map<HKEY, DWORD> & usagestats_map() const {
125	125	return usagestats_map_;
126	126	}
127	127	int run_level() const {

132	132	}
133	133
134	134	private:
135		map<HKEY, DWORD> usagestats_map_;
	135	std::map<HKEY, DWORD> usagestats_map_;
136	136	int run_level_;
137	137	};
138	138	typedef PropertySelector<Id> Property;

-1

src/data/version/mozc_version_template.bzl less more

29	29
30	30	MAJOR=2
31	31	MINOR=23
32		BUILD=2795
	32	BUILD=2796
33	33	REVISION=102
34	34	# This version represents the version of Mozc IME engine (converter, predictor,
35	35	# etc.). This version info is included both in the Mozc server and in the Mozc

-2

src/gui/base/msime_user_dictionary_importer.cc less more

197	197	Util::WideToUTF8(buf_[index_].pwchDisplay, &entry->value);
198	198
199	199	// set POS
200		map<int, string>::const_iterator it = pos_map_.find(buf_[index_].nPos1);
	200	std::map<int, string>::const_iterator it =
	201	pos_map_.find(buf_[index_].nPos1);
201	202	if (it == pos_map_.end()) {
202	203	++index_;
203	204	LOG(ERROR) << "Unknown POS id: " << buf_[index_].nPos1;

243	244	private:
244	245	std::vector<IMEWRD> buf_;
245	246	ScopedIFEDictionary dic_;
246		map<int, string> pos_map_;
	247	std::map<int, string> pos_map_;
247	248	HRESULT result_;
248	249	ULONG size_;
249	250	ULONG index_;

-2

src/win32/base/deleter.cc less more

40	40	namespace win32 {
41	41
42	42	class VKBackBasedDeleterQueue
43		: public std::deque<pair<VKBackBasedDeleter::DeletionWaitState,
44		VKBackBasedDeleter::ClientAction>> {
	43	: public std::deque<std::pair<VKBackBasedDeleter::DeletionWaitState,
	44	VKBackBasedDeleter::ClientAction>> {
45	45	};
46	46
47	47	VKBackBasedDeleter::VKBackBasedDeleter()