Workaround for VS 2005 bug with inheritance from nested classes.

BUG=http://crbug.com/61717
TEST=Build on VS 2005
Review URL: http://codereview.chromium.org/4271003


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@64939 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 10 insertions, 2 deletions

diff --git a/jingle/notifier/communicator/login.h b/jingle/notifier/communicator/login.h
index d80de6c..fec490e 100644
--- a/jingle/notifier/communicator/login.h
+++ b/jingle/notifier/communicator/login.h
@@ -36,11 +36,15 @@ class ConnectionOptions;
 class LoginSettings;
 struct ServerInformation;
 
+// Workaround for MSVS 2005 bug that fails to handle inheritance from a nested
+// class properly if it comes directly on a base class list.
+typedef SingleLoginAttempt::Delegate SingleLoginAttemptDelegate;
+
 // Does the login, keeps it alive (with refreshing cookies and reattempting
 // login when disconnected), figures out what actions to take on the various
 // errors that may occur.
 class Login : public net::NetworkChangeNotifier::Observer,
-              public SingleLoginAttempt::Delegate {
+              public SingleLoginAttemptDelegate {
  public:
   class Delegate {
    public:
diff --git a/jingle/notifier/listener/mediator_thread_impl.h b/jingle/notifier/listener/mediator_thread_impl.h
index 17efcad..a4a1de6 100644
--- a/jingle/notifier/listener/mediator_thread_impl.h
+++ b/jingle/notifier/listener/mediator_thread_impl.h
@@ -46,7 +46,11 @@ class HostResolver;
 
 namespace notifier {
 
-class MediatorThreadImpl : public MediatorThread, public Login::Delegate,
+// Workaround for MSVS 2005 bug that fails to handle inheritance from a nested
+// class properly if it comes directly on a base class list.
+typedef Login::Delegate LoginDelegate;
+
+class MediatorThreadImpl : public MediatorThread, public LoginDelegate,
                            public sigslot::has_slots<> {
  public:
   explicit MediatorThreadImpl(const NotifierOptions& notifier_options);