mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

add traits class to solve multiple |GetIID()| problems

This commit is contained in:
scc%netscape.com 1999-06-29 20:11:57 +00:00
Родитель 6fb359882b
Коммит 7f5981ed65
2 изменённых файлов: 70 добавлений и 4 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

37
xpcom/base/nsISupportsUtils.h
Просмотреть файл

@ -36,6 +36,18 @@ struct JSObject;
struct JSContext; struct JSContext;
#endif #endif
// under Metrowerks (Mac), we don't have autoconf yet
#ifdef __MWERKS__
#define HAVE_CPP_SPECIALIZATION
#endif
// until we fix the rest of the code, this needs to be turned off
#undef HAVE_CPP_SPECIALIZATION
#ifdef HAVE_CPP_SPECIALIZATION
#define NSCAP_FEATURE_HIDE_NSISUPPORTS_GETIID
#endif
/*@{*/ /*@{*/
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -85,7 +97,11 @@ typedef PRUint32 nsrefcnt;
*/ */
class nsISupports XPCOM_OBJECT { class nsISupports XPCOM_OBJECT {
public: public:
#ifndef NSCAP_FEATURE_HIDE_NSISUPPORTS_GETIID
static const nsIID& GetIID() { static nsIID iid = NS_ISUPPORTS_IID; return iid; } static const nsIID& GetIID() { static nsIID iid = NS_ISUPPORTS_IID; return iid; }
#endif
/** /**
* @name Methods * @name Methods
*/ */
@ -241,7 +257,7 @@ NS_IMETHODIMP _class::QueryInterface(REFNSIID aIID, void** aInstancePtr) \
NS_ADDREF_THIS(); \ NS_ADDREF_THIS(); \
return NS_OK; \ return NS_OK; \
} \ } \
if (aIID.Equals(nsISupports::GetIID())) { \ if (aIID.Equals(nsCOMTypeInfo<nsISupports>::GetIID())) { \
*aInstancePtr = (void*) ((nsISupports*)this); \ *aInstancePtr = (void*) ((nsISupports*)this); \
NS_ADDREF_THIS(); \ NS_ADDREF_THIS(); \
return NS_OK; \ return NS_OK; \
@ -702,6 +718,22 @@ extern "C++" {
class nsISupports; class nsISupports;
template <class T>
struct nsCOMTypeInfo
{
static const nsIID& GetIID() { return T::GetIID(); }
};
#ifdef NSCAP_FEATURE_HIDE_NSISUPPORTS_GETIID
template <>
struct nsCOMTypeInfo<nsISupports>
{
static const nsIID& GetIID() { static nsIID iid = NS_ISUPPORTS_IID; return iid; }
};
#endif
#define NS_GET_IID(T) nsCOMTypeInfo<T>::GetIID()
template <class DestinationType> template <class DestinationType>
inline inline
nsresult nsresult
@ -709,8 +741,9 @@ CallQueryInterface( nsISupports* aSource, DestinationType** aDestination )
// a type-safe shortcut for calling the |QueryInterface()| member function // a type-safe shortcut for calling the |QueryInterface()| member function
{ {
NS_PRECONDITION(aSource, "null parameter"); NS_PRECONDITION(aSource, "null parameter");
NS_PRECONDITION(aDestination, "null parameter");
return aSource->QueryInterface(DestinationType::GetIID(), (void**)aDestination); return aSource->QueryInterface(nsCOMTypeInfo<DestinationType>::GetIID(), (void**)aDestination);
} }
} // extern "C++" } // extern "C++"

37
xpcom/glue/nsISupportsUtils.h
Просмотреть файл

@ -36,6 +36,18 @@ struct JSObject;
struct JSContext; struct JSContext;
#endif #endif
// under Metrowerks (Mac), we don't have autoconf yet
#ifdef __MWERKS__
#define HAVE_CPP_SPECIALIZATION
#endif
// until we fix the rest of the code, this needs to be turned off
#undef HAVE_CPP_SPECIALIZATION
#ifdef HAVE_CPP_SPECIALIZATION
#define NSCAP_FEATURE_HIDE_NSISUPPORTS_GETIID
#endif
/*@{*/ /*@{*/
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -85,7 +97,11 @@ typedef PRUint32 nsrefcnt;
*/ */
class nsISupports XPCOM_OBJECT { class nsISupports XPCOM_OBJECT {
public: public:
#ifndef NSCAP_FEATURE_HIDE_NSISUPPORTS_GETIID
static const nsIID& GetIID() { static nsIID iid = NS_ISUPPORTS_IID; return iid; } static const nsIID& GetIID() { static nsIID iid = NS_ISUPPORTS_IID; return iid; }
#endif
/** /**
* @name Methods * @name Methods
*/ */
@ -241,7 +257,7 @@ NS_IMETHODIMP _class::QueryInterface(REFNSIID aIID, void** aInstancePtr) \
NS_ADDREF_THIS(); \ NS_ADDREF_THIS(); \
return NS_OK; \ return NS_OK; \
} \ } \
if (aIID.Equals(nsISupports::GetIID())) { \ if (aIID.Equals(nsCOMTypeInfo<nsISupports>::GetIID())) { \
*aInstancePtr = (void*) ((nsISupports*)this); \ *aInstancePtr = (void*) ((nsISupports*)this); \
NS_ADDREF_THIS(); \ NS_ADDREF_THIS(); \
return NS_OK; \ return NS_OK; \
@ -702,6 +718,22 @@ extern "C++" {
class nsISupports; class nsISupports;
template <class T>
struct nsCOMTypeInfo
{
static const nsIID& GetIID() { return T::GetIID(); }
};
#ifdef NSCAP_FEATURE_HIDE_NSISUPPORTS_GETIID
template <>
struct nsCOMTypeInfo<nsISupports>
{
static const nsIID& GetIID() { static nsIID iid = NS_ISUPPORTS_IID; return iid; }
};
#endif
#define NS_GET_IID(T) nsCOMTypeInfo<T>::GetIID()
template <class DestinationType> template <class DestinationType>
inline inline
nsresult nsresult
@ -709,8 +741,9 @@ CallQueryInterface( nsISupports* aSource, DestinationType** aDestination )
// a type-safe shortcut for calling the |QueryInterface()| member function // a type-safe shortcut for calling the |QueryInterface()| member function
{ {
NS_PRECONDITION(aSource, "null parameter"); NS_PRECONDITION(aSource, "null parameter");
NS_PRECONDITION(aDestination, "null parameter");
return aSource->QueryInterface(DestinationType::GetIID(), (void**)aDestination); return aSource->QueryInterface(nsCOMTypeInfo<DestinationType>::GetIID(), (void**)aDestination);
} }
} // extern "C++" } // extern "C++"