bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Linux: Fix compile errors due to issue #386 changes. 

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@347 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2011-10-31 15:26:47 +00:00
parent ef80d4ae6b
commit e6c93810c8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libcef/cef_string_multimap.cc
View File

@ -46,7 +46,7 @@ CEF_EXPORT int cef_string_multimap_enumerate(cef_string_multimap_t map,
DCHECK(value_index >= 0 && value_index < (int)impl->count(key_str)); DCHECK(value_index >= 0 && value_index < (int)impl->count(key_str));
if(value_index < 0 || value_index >= (int)impl->count(key_str)) if(value_index < 0 || value_index >= (int)impl->count(key_str))
return NULL; return 0;
std::pair<StringMultimap::iterator, StringMultimap::iterator> range_it = std::pair<StringMultimap::iterator, StringMultimap::iterator> range_it =
impl->equal_range(key_str); impl->equal_range(key_str);
@ -56,7 +56,7 @@ CEF_EXPORT int cef_string_multimap_enumerate(cef_string_multimap_t map,
range_it.first++; range_it.first++;
if (range_it.first == range_it.second) if (range_it.first == range_it.second)
return NULL; return 0;
const CefString& val = range_it.first->second; const CefString& val = range_it.first->second;
return cef_string_set(val.c_str(), val.length(), value, true); return cef_string_set(val.c_str(), val.length(), value, true);
@ -70,7 +70,7 @@ CEF_EXPORT int cef_string_multimap_key(cef_string_multimap_t map, int index,
StringMultimap* impl = (StringMultimap*)map; StringMultimap* impl = (StringMultimap*)map;
DCHECK(index >= 0 && index < (int)impl->size()); DCHECK(index >= 0 && index < (int)impl->size());
if(index < 0 || index >= (int)impl->size()) if(index < 0 || index >= (int)impl->size())
return NULL; return 0;
StringMultimap::const_iterator it = impl->begin(); StringMultimap::const_iterator it = impl->begin();
for(int ct = 0; it != impl->end(); ++it, ct++) { for(int ct = 0; it != impl->end(); ++it, ct++) {
if(ct == index) if(ct == index)
@ -87,7 +87,7 @@ CEF_EXPORT int cef_string_multimap_value(cef_string_multimap_t map, int index,
StringMultimap* impl = (StringMultimap*)map; StringMultimap* impl = (StringMultimap*)map;
DCHECK(index >= 0 && index < (int)impl->size()); DCHECK(index >= 0 && index < (int)impl->size());
if(index < 0 || index >= (int)impl->size()) if(index < 0 || index >= (int)impl->size())
return NULL; return 0;
StringMultimap::const_iterator it = impl->begin(); StringMultimap::const_iterator it = impl->begin();
for(int ct = 0; it != impl->end(); ++it, ct++) { for(int ct = 0; it != impl->end(); ++it, ct++) {
if(ct == index) { if(ct == index) {