Skip to content

Commit

Permalink
Fix Windows build by renaming interface to iface.
Browse files Browse the repository at this point in the history
TEST=it compiles
Review URL: http://codereview.chromium.org/7871005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100751 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
brettw@chromium.org committed Sep 12, 2011
1 parent 3114db2 commit 7a29193
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
12 changes: 6 additions & 6 deletions ppapi/proxy/interface_list.cc
Original file line number Diff line number Diff line change
Expand Up @@ -241,15 +241,15 @@ const void* InterfaceList::GetInterfaceForPPB(const std::string& name) const {
name_to_browser_info_.find(name);
if (found == name_to_browser_info_.end())
return NULL;
return found->second.interface;
return found->second.iface;
}

const void* InterfaceList::GetInterfaceForPPP(const std::string& name) const {
NameToInterfaceInfoMap::const_iterator found =
name_to_plugin_info_.find(name);
if (found == name_to_plugin_info_.end())
return NULL;
return found->second.interface;
return found->second.iface;
}

void InterfaceList::AddProxy(InterfaceID id,
Expand All @@ -270,16 +270,16 @@ void InterfaceList::AddProxy(InterfaceID id,

void InterfaceList::AddPPB(const char* name,
InterfaceID id,
const void* interface) {
const void* iface) {
DCHECK(name_to_browser_info_.find(name) == name_to_browser_info_.end());
name_to_browser_info_[name] = InterfaceInfo(id, interface);
name_to_browser_info_[name] = InterfaceInfo(id, iface);
}

void InterfaceList::AddPPP(const char* name,
InterfaceID id,
const void* interface) {
const void* iface) {
DCHECK(name_to_plugin_info_.find(name) == name_to_plugin_info_.end());
name_to_plugin_info_[name] = InterfaceInfo(id, interface);
name_to_plugin_info_[name] = InterfaceInfo(id, iface);
}

void InterfaceList::AddPPB(const InterfaceProxy::Info* info) {
Expand Down
6 changes: 3 additions & 3 deletions ppapi/proxy/interface_list.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,15 @@ class InterfaceList {
}

InterfaceID id;
const void* interface;
const void* iface;
};

typedef std::map<std::string, InterfaceInfo> NameToInterfaceInfoMap;

void AddProxy(InterfaceID id, InterfaceProxy::Factory factory);

void AddPPB(const char* name, InterfaceID id, const void* interface);
void AddPPP(const char* name, InterfaceID id, const void* interface);
void AddPPB(const char* name, InterfaceID id, const void* iface);
void AddPPP(const char* name, InterfaceID id, const void* iface);

// Old-style add functions. These should be removed when the rest of the
// proxies are converted over to using the new system.
Expand Down

0 comments on commit 7a29193

Please sign in to comment.