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

Windows: Fix 64-bit compile errors (issue #1184). 

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@1576 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
This commit is contained in:
Marshall Greenblatt 2014-01-28 16:58:44 +00:00
parent 0df95ca529
commit 0c8b381a46
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libcef_dll/wrapper/cef_message_router.cc
View File

@ -222,9 +222,10 @@ class CefMessageRouterBrowserSideImpl : public CefMessageRouterBrowserSide {
return visitor.count(); return visitor.count();
} else if (browser.get()) { } else if (browser.get()) {
return browser_query_info_map_.size(browser->GetIdentifier()); return static_cast<int>(
browser_query_info_map_.size(browser->GetIdentifier()));
} else { } else {
return browser_query_info_map_.size(); return static_cast<int>(browser_query_info_map_.size());
} }
return 0; return 0;
@ -776,9 +777,10 @@ class CefMessageRouterRendererSideImpl : public CefMessageRouterRendererSide {
return visitor.count(); return visitor.count();
} else if (browser.get()) { } else if (browser.get()) {
return browser_request_info_map_.size(browser->GetIdentifier()); return static_cast<int>(
browser_request_info_map_.size(browser->GetIdentifier()));
} else { } else {
return browser_request_info_map_.size(); return static_cast<int>(browser_request_info_map_.size());
} }
return 0; return 0;

7
tests/unittests/message_router_unittest.cc
View File

@ -2238,7 +2238,8 @@ class MultiQueryManagerMap :
EXPECT_EQ(it, manager_map_.end()); EXPECT_EQ(it, manager_map_.end());
MultiQueryManager* manager = MultiQueryManager* manager =
new MultiQueryManager(url, synchronous, manager_map_.size() * 1000); new MultiQueryManager(url, synchronous,
static_cast<int>(manager_map_.size()) * 1000);
manager->AddObserver(this); manager->AddObserver(this);
manager_map_.insert(std::make_pair(url, manager)); manager_map_.insert(std::make_pair(url, manager));
@ -2408,8 +2409,8 @@ class MultiQueryManagerMap :
static std::string GetNameForURL(const std::string& url) { static std::string GetNameForURL(const std::string& url) {
// Extract the file name without extension. // Extract the file name without extension.
int pos1 = url.rfind("/"); int pos1 = static_cast<int>(url.rfind("/"));
int pos2 = url.rfind("."); int pos2 = static_cast<int>(url.rfind("."));
EXPECT_TRUE(pos1 >= 0 && pos2 >= 0 && pos1 < pos2); EXPECT_TRUE(pos1 >= 0 && pos2 >= 0 && pos1 < pos2);
return url.substr(pos1 + 1, pos2 - pos1 - 1); return url.substr(pos1 + 1, pos2 - pos1 - 1);
} }