Commit 184429b7 authored by rnk@chromium.org's avatar rnk@chromium.org

Fix member pointer callbacks in an ATL sink map

Clang won't let you form a pointer to member without an explicit
'&ClassName::' before the method name.  In fact, neither will MSVC
unless you explicitly disable the error, which the ATL does.  This has
been documented on MSDN since VS 2005:
http://msdn.microsoft.com/en-us/library/ms174271.aspx

Clang doesn't implement this extension, so just fix the code.

R=wez@chromium.org
BUG=82385

Review URL: https://codereview.chromium.org/410853002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285118 0039d316-1c4b-4281-b951-d872f2087c98
parent 4ffef210
......@@ -104,14 +104,18 @@ class RdpClientWindow
void OnDestroy();
BEGIN_SINK_MAP(RdpClientWindow)
SINK_ENTRY_EX(1, __uuidof(mstsc::IMsTscAxEvents), 2, OnConnected)
SINK_ENTRY_EX(1, __uuidof(mstsc::IMsTscAxEvents), 4, OnDisconnected)
SINK_ENTRY_EX(1, __uuidof(mstsc::IMsTscAxEvents), 10, OnFatalError)
SINK_ENTRY_EX(1, __uuidof(mstsc::IMsTscAxEvents), 15, OnConfirmClose)
SINK_ENTRY_EX(1, __uuidof(mstsc::IMsTscAxEvents), 2,
&RdpClientWindow::OnConnected)
SINK_ENTRY_EX(1, __uuidof(mstsc::IMsTscAxEvents), 4,
&RdpClientWindow::OnDisconnected)
SINK_ENTRY_EX(1, __uuidof(mstsc::IMsTscAxEvents), 10,
&RdpClientWindow::OnFatalError)
SINK_ENTRY_EX(1, __uuidof(mstsc::IMsTscAxEvents), 15,
&RdpClientWindow::OnConfirmClose)
SINK_ENTRY_EX(1, __uuidof(mstsc::IMsTscAxEvents), 18,
OnAuthenticationWarningDisplayed)
&RdpClientWindow::OnAuthenticationWarningDisplayed)
SINK_ENTRY_EX(1, __uuidof(mstsc::IMsTscAxEvents), 19,
OnAuthenticationWarningDismissed)
&RdpClientWindow::OnAuthenticationWarningDismissed)
END_SINK_MAP()
// mstsc::IMsTscAxEvents notifications.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment