summaryrefslogtreecommitdiffstats
path: root/base/scoped_comptr_win.h
diff options
context:
space:
mode:
authortommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-07 02:54:45 +0000
committertommi@chromium.org <tommi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-07 02:54:45 +0000
commit330436fef8372d1a2498aca063cc5fd88626a977 (patch)
tree059034e4dbbc796bbaec3992c7234f0d73a93556 /base/scoped_comptr_win.h
parent8a1c6eb3659da05782b9444ab2db05d90b9b7b93 (diff)
downloadchromium_src-330436fef8372d1a2498aca063cc5fd88626a977.zip
chromium_src-330436fef8372d1a2498aca063cc5fd88626a977.tar.gz
chromium_src-330436fef8372d1a2498aca063cc5fd88626a977.tar.bz2
Pulling in operator=() to ScopedComPtr.
Review URL: http://codereview.chromium.org/40256 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11193 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/scoped_comptr_win.h')
-rw-r--r--base/scoped_comptr_win.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/base/scoped_comptr_win.h b/base/scoped_comptr_win.h
index d627223..9ba0b84 100644
--- a/base/scoped_comptr_win.h
+++ b/base/scoped_comptr_win.h
@@ -138,6 +138,9 @@ class ScopedComPtr : public scoped_refptr<Interface> {
return reinterpret_cast<BlockIUnknownMethods<Interface>*>(ptr_);
}
+ // Pull in operator=() from the parent class.
+ using scoped_refptr<Interface>::operator=;
+
// static methods
static const IID& iid() {