Back out 8396d7543197 (bug 857645) for build bustage

CLOSED TREE
This commit is contained in:
Phil Ringnalda 2013-04-04 22:27:19 -07:00
parent f696a62a20
commit 177cee569f

View File

@ -20,8 +20,6 @@
*/
#include "mozilla/Attributes.h"
#include "mozilla/TypeTraits.h"
#include "mozilla/Assertions.h"
// Wrapping includes can speed up compiles (see "Large Scale C++ Software Design")
#ifndef nsDebug_h___
@ -550,18 +548,6 @@ class nsCOMPtr MOZ_FINAL
NSCAP_ASSERT_NO_QUERY_NEEDED();
}
template<typename U>
nsCOMPtr( const already_AddRefed<U>& aSmartPtr )
: NSCAP_CTOR_BASE(static_cast<T*>(aSmartPtr.mRawPtr))
// construct from |dont_AddRef(expr)|
{
// But make sure that U actually inherits from T
MOZ_STATIC_ASSERT((mozilla::IsBaseOf<T, U>::value),
"U is not a subclass of T");
NSCAP_LOG_ASSIGNMENT(this, static_cast<T*>(aSmartPtr.mRawPtr));
NSCAP_ASSERT_NO_QUERY_NEEDED();
}
nsCOMPtr( const nsQueryInterface qi )
: NSCAP_CTOR_BASE(0)
// construct from |do_QueryInterface(expr)|