Remove unneeded #define in ref_counted.h

base/memory/ref_counted.h

Index: base/memory/ref_counted.h
diff --git a/base/memory/ref_counted.h b/base/memory/ref_counted.h
index e05f45dc8a2d5dc3a765f466a8ab6eefd8694357..95bdb8e66393be72ae48e3b6ecb373527153c8ad 100644
--- a/base/memory/ref_counted.h
+++ b/base/memory/ref_counted.h
@@ -17,10 +17,6 @@
 #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) || defined(OS_WIN)
-#define DISABLE_SCOPED_REFPTR_CONVERSION_OPERATOR
-#endif
-
 namespace base {
 
 namespace subtle {
@@ -297,12 +293,6 @@ class scoped_refptr {
 
   T* get() const { return ptr_; }
 
-#if !defined(DISABLE_SCOPED_REFPTR_CONVERSION_OPERATOR)
-  // Allow scoped_refptr<C> to be used in boolean expression
-  // and comparison operations.
-  operator T*() const { return ptr_; }
-#endif
-
   T& operator*() const {
     assert(ptr_ != NULL);
     return *ptr_;
@@ -343,7 +333,6 @@ class scoped_refptr {
     swap(&r.ptr_);
   }
 
-#if defined(DISABLE_SCOPED_REFPTR_CONVERSION_OPERATOR)
   template <typename U>
   bool operator==(const scoped_refptr<U>& rhs) const {
     return ptr_ == rhs.get();
@@ -358,7 +347,6 @@ class scoped_refptr {
   bool operator<(const scoped_refptr<U>& rhs) const {
     return ptr_ < rhs.get();
   }
-#endif
 
  protected:
   T* ptr_;
@@ -389,7 +377,6 @@ scoped_refptr<T> make_scoped_refptr(T* t) {
   return scoped_refptr<T>(t);
 }
 
-#if defined(DISABLE_SCOPED_REFPTR_CONVERSION_OPERATOR)
 // Temporary operator overloads to facilitate the transition...

[Nico, 2014/11/25 02:59:10]

Should this have a link to the bug?

[dcheng, 2014/11/25 03:00:47]

Done.

 template <typename T, typename U>
 bool operator==(const scoped_refptr<T>& lhs, const U* rhs) {
@@ -415,6 +402,5 @@ template <typename T>
 std::ostream& operator<<(std::ostream& out, const scoped_refptr<T>& p) {
   return out << p.get();
 }
-#endif  // defined(DISABLE_SCOPED_REFPTR_CONVERSION_OPERATOR)
 
 #endif  // BASE_MEMORY_REF_COUNTED_H_