Disable implicit conversion of scoped_refptr<T> to T* on Windows.

Finally!!! BUG=110610 Review URL: https://codereview.chromium.org/748073004 Cr-Commit-Position: refs/heads/master@{#305558}
Denger-Network · Nov 25, 2014 · 1c3841d · 1c3841d
1 parent 6348198
commit 1c3841d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/base/memory/ref_counted.h b/base/memory/ref_counted.h
@@ -17,7 +17,7 @@
 #include "base/threading/thread_collision_warner.h"
 #include "build/build_config.h"
 
-#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_IOS) || defined(OS_ANDROID)
+#if defined(OS_LINUX) || defined(OS_MACOSX) || defined(OS_IOS) || defined(OS_ANDROID) || defined(OS_WIN)
 #define DISABLE_SCOPED_REFPTR_CONVERSION_OPERATOR
 #endif
 

diff --git a/base/win/scoped_comptr.h b/base/win/scoped_comptr.h
@@ -133,8 +133,7 @@ class ScopedComPtr : public scoped_refptr<Interface> {
     ScopedComPtr<IUnknown> other_identity;
     other->QueryInterface(other_identity.Receive());
 
-    return static_cast<IUnknown*>(my_identity) ==
-           static_cast<IUnknown*>(other_identity);
+    return my_identity == other_identity;
   }
 
   // Provides direct access to the interface.