Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-28 05:10:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove unneeded duplication from nsCOMPtr.h. b=208449 r=sicking sr=jag

Browse Source
This commit is contained in:
dbaron%dbaron.org 2003-06-05 23:43:08 +00:00
parent 6332f27e38
commit 58f15ed67e
1 changed files with 3 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
xpcom/base/nsAutoPtr.h
View File

@ -42,21 +42,12 @@
// Wrapping includes can speed up compiles (see "Large Scale C++ Software Design")
#ifndef nsCOMPtr_h___
// For |already_AddRefed|, |nsDerivedSafe|, |NSCAP_Zero|.
// For |already_AddRefed|, |nsDerivedSafe|, |NSCAP_Zero|,
// |NSCAP_DONT_PROVIDE_NONCONST_OPEQ|,
// |NSCAP_FEATURE_INLINE_STARTASSIGNMENT|
#include "nsCOMPtr.h"
#endif
#ifdef _MSC_VER
#define NSCAP_FEATURE_INLINE_STARTASSIGNMENT
// under VC++, we win by inlining StartAssignment
// Also under VC++, at the highest warning level, we are overwhelmed with warnings
// about (unused) inline functions being removed. This is to be expected with
// templates, so we disable the warning.
#pragma warning( disable: 4514 )
#endif
/*****************************************************************************/
// template <class T> class nsAutoPtrGetterTransfers;
@ -377,13 +368,6 @@ operator!=( const U* lhs, const nsAutoPtr<T>& rhs )
// |operator==| without the |const| on the raw pointer.
// See bug 65664 for details.
// This is defined by an autoconf test, but VC++ also has a bug that
// prevents us from using these. (It also, fortunately, has the bug
// that we don't need them either.)
#ifdef _MSC_VER
#define NSCAP_DONT_PROVIDE_NONCONST_OPEQ
#endif
#ifndef NSCAP_DONT_PROVIDE_NONCONST_OPEQ
template <class T, class U>
inline
@ -804,13 +788,6 @@ operator!=( const U* lhs, const nsAutoArrayPtr<T>& rhs )
// |operator==| without the |const| on the raw pointer.
// See bug 65664 for details.
// This is defined by an autoconf test, but VC++ also has a bug that
// prevents us from using these. (It also, fortunately, has the bug
// that we don't need them either.)
#ifdef _MSC_VER
#define NSCAP_DONT_PROVIDE_NONCONST_OPEQ
#endif
#ifndef NSCAP_DONT_PROVIDE_NONCONST_OPEQ
template <class T, class U>
inline
@ -1253,13 +1230,6 @@ operator!=( const U* lhs, const nsRefPtr<T>& rhs )
// |operator==| without the |const| on the raw pointer.
// See bug 65664 for details.
// This is defined by an autoconf test, but VC++ also has a bug that
// prevents us from using these. (It also, fortunately, has the bug
// that we don't need them either.)
#ifdef _MSC_VER
#define NSCAP_DONT_PROVIDE_NONCONST_OPEQ
#endif
#ifndef NSCAP_DONT_PROVIDE_NONCONST_OPEQ
template <class T, class U>
inline