Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Deal with type unification errors on gcc-2.7.2.3 using NEW_STRING_APIS. r=scc

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@69493 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
waterson%netscape.com
2000-05-13 00:23:04 +00:00
parent 00dcb069d9
commit 3c024cf900
6 changed files with 204 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mozilla/string/obsolete/nsXPIDLString.cpp
View File

@@ -47,7 +47,7 @@ nsXPIDLString::~nsXPIDLString()
}
nsXPIDLString::operator const PRUnichar*()
nsXPIDLString::operator const PRUnichar*() const
{
return mBuf;
}
@@ -141,7 +141,7 @@ nsXPIDLCString& nsXPIDLCString::operator =(const char* aCString)
}
nsXPIDLCString::operator const char*()
nsXPIDLCString::operator const char*() const
{
return mBuf;
}

68
mozilla/string/obsolete/nsXPIDLString.h
View File

@@ -116,7 +116,7 @@ public:
/**
* Return a reference to the immutable Unicode string.
*/
operator const PRUnichar*();
operator const PRUnichar*() const;
/**
* Make a copy of the Unicode string. Use this function in the
@@ -192,6 +192,39 @@ getter_Shares(nsXPIDLString& aXPIDLString)
}
// XXX THESE ARE NOT strcmp()! DON'T TRY TO USE THEM AS SUCH!
inline
PRBool
operator==(const PRUnichar* lhs, const nsXPIDLString& rhs)
{
return lhs == NS_STATIC_CAST(const PRUnichar*, rhs);
}
inline
PRBool
operator==(const nsXPIDLString& lhs, const PRUnichar* rhs)
{
return NS_STATIC_CAST(const PRUnichar*, lhs) == rhs;
}
#ifdef HAVE_CPP_TROUBLE_COMPARING_TO_ZERO
inline
PRBool
operator==(int lhs, const nsXPIDLString& rhs)
{
return NS_REINTERPRET_CAST(PRUnichar*, lhs) == NS_STATIC_CAST(const PRUnichar*, rhs);
}
inline
PRBool
operator==(const nsXPIDLString& lhs, int rhs)
{
return NS_STATIC_CAST(const PRUnichar*, lhs) == NS_REINTERPRET_CAST(PRUnichar*, rhs);
}
#endif
////////////////////////////////////////////////////////////////////////
// nsXPIDLCString
@@ -226,7 +259,7 @@ public:
/**
* Return a reference to the immutable single-byte string.
*/
operator const char*();
operator const char*() const;
/**
* Make a copy of the single-byte string. Use this function in the
@@ -301,6 +334,37 @@ getter_Shares(nsXPIDLCString& aXPIDLString)
return nsXPIDLCString::GetterShares(aXPIDLString);
}
// XXX THESE ARE NOT strcmp()! DON'T TRY TO USE THEM AS SUCH!
inline
PRBool
operator==(const char* lhs, const nsXPIDLCString& rhs)
{
return lhs == NS_STATIC_CAST(const char*, rhs);
}
inline
PRBool
operator==(const nsXPIDLCString& lhs, const char* rhs)
{
return NS_STATIC_CAST(const char*, lhs) == rhs;
}
#ifdef HAVE_CPP_TROUBLE_COMPARING_TO_ZERO
inline
PRBool
operator==(int lhs, const nsXPIDLCString& rhs)
{
return NS_REINTERPRET_CAST(char*, lhs) == NS_STATIC_CAST(const char*, rhs);
}
inline
PRBool
operator==(const nsXPIDLCString& lhs, int rhs)
{
return NS_STATIC_CAST(const char*, lhs) == NS_REINTERPRET_CAST(char*, rhs);
}
#endif
#endif // nsXPIDLString_h__

4
mozilla/xpcom/ds/nsXPIDLString.cpp
View File

@@ -47,7 +47,7 @@ nsXPIDLString::~nsXPIDLString()
}
nsXPIDLString::operator const PRUnichar*()
nsXPIDLString::operator const PRUnichar*() const
{
return mBuf;
}
@@ -141,7 +141,7 @@ nsXPIDLCString& nsXPIDLCString::operator =(const char* aCString)
}
nsXPIDLCString::operator const char*()
nsXPIDLCString::operator const char*() const
{
return mBuf;
}

68
mozilla/xpcom/ds/nsXPIDLString.h
View File

@@ -116,7 +116,7 @@ public:
/**
* Return a reference to the immutable Unicode string.
*/
operator const PRUnichar*();
operator const PRUnichar*() const;
/**
* Make a copy of the Unicode string. Use this function in the
@@ -192,6 +192,39 @@ getter_Shares(nsXPIDLString& aXPIDLString)
}
// XXX THESE ARE NOT strcmp()! DON'T TRY TO USE THEM AS SUCH!
inline
PRBool
operator==(const PRUnichar* lhs, const nsXPIDLString& rhs)
{
return lhs == NS_STATIC_CAST(const PRUnichar*, rhs);
}
inline
PRBool
operator==(const nsXPIDLString& lhs, const PRUnichar* rhs)
{
return NS_STATIC_CAST(const PRUnichar*, lhs) == rhs;
}
#ifdef HAVE_CPP_TROUBLE_COMPARING_TO_ZERO
inline
PRBool
operator==(int lhs, const nsXPIDLString& rhs)
{
return NS_REINTERPRET_CAST(PRUnichar*, lhs) == NS_STATIC_CAST(const PRUnichar*, rhs);
}
inline
PRBool
operator==(const nsXPIDLString& lhs, int rhs)
{
return NS_STATIC_CAST(const PRUnichar*, lhs) == NS_REINTERPRET_CAST(PRUnichar*, rhs);
}
#endif
////////////////////////////////////////////////////////////////////////
// nsXPIDLCString
@@ -226,7 +259,7 @@ public:
/**
* Return a reference to the immutable single-byte string.
*/
operator const char*();
operator const char*() const;
/**
* Make a copy of the single-byte string. Use this function in the
@@ -301,6 +334,37 @@ getter_Shares(nsXPIDLCString& aXPIDLString)
return nsXPIDLCString::GetterShares(aXPIDLString);
}
// XXX THESE ARE NOT strcmp()! DON'T TRY TO USE THEM AS SUCH!
inline
PRBool
operator==(const char* lhs, const nsXPIDLCString& rhs)
{
return lhs == NS_STATIC_CAST(const char*, rhs);
}
inline
PRBool
operator==(const nsXPIDLCString& lhs, const char* rhs)
{
return NS_STATIC_CAST(const char*, lhs) == rhs;
}
#ifdef HAVE_CPP_TROUBLE_COMPARING_TO_ZERO
inline
PRBool
operator==(int lhs, const nsXPIDLCString& rhs)
{
return NS_REINTERPRET_CAST(char*, lhs) == NS_STATIC_CAST(const char*, rhs);
}
inline
PRBool
operator==(const nsXPIDLCString& lhs, int rhs)
{
return NS_STATIC_CAST(const char*, lhs) == NS_REINTERPRET_CAST(char*, rhs);
}
#endif
#endif // nsXPIDLString_h__

4
mozilla/xpcom/string/obsolete/nsXPIDLString.cpp
View File

@@ -47,7 +47,7 @@ nsXPIDLString::~nsXPIDLString()
}
nsXPIDLString::operator const PRUnichar*()
nsXPIDLString::operator const PRUnichar*() const
{
return mBuf;
}
@@ -141,7 +141,7 @@ nsXPIDLCString& nsXPIDLCString::operator =(const char* aCString)
}
nsXPIDLCString::operator const char*()
nsXPIDLCString::operator const char*() const
{
return mBuf;
}

68
mozilla/xpcom/string/obsolete/nsXPIDLString.h
View File

@@ -116,7 +116,7 @@ public:
/**
* Return a reference to the immutable Unicode string.
*/
operator const PRUnichar*();
operator const PRUnichar*() const;
/**
* Make a copy of the Unicode string. Use this function in the
@@ -192,6 +192,39 @@ getter_Shares(nsXPIDLString& aXPIDLString)
}
// XXX THESE ARE NOT strcmp()! DON'T TRY TO USE THEM AS SUCH!
inline
PRBool
operator==(const PRUnichar* lhs, const nsXPIDLString& rhs)
{
return lhs == NS_STATIC_CAST(const PRUnichar*, rhs);
}
inline
PRBool
operator==(const nsXPIDLString& lhs, const PRUnichar* rhs)
{
return NS_STATIC_CAST(const PRUnichar*, lhs) == rhs;
}
#ifdef HAVE_CPP_TROUBLE_COMPARING_TO_ZERO
inline
PRBool
operator==(int lhs, const nsXPIDLString& rhs)
{
return NS_REINTERPRET_CAST(PRUnichar*, lhs) == NS_STATIC_CAST(const PRUnichar*, rhs);
}
inline
PRBool
operator==(const nsXPIDLString& lhs, int rhs)
{
return NS_STATIC_CAST(const PRUnichar*, lhs) == NS_REINTERPRET_CAST(PRUnichar*, rhs);
}
#endif
////////////////////////////////////////////////////////////////////////
// nsXPIDLCString
@@ -226,7 +259,7 @@ public:
/**
* Return a reference to the immutable single-byte string.
*/
operator const char*();
operator const char*() const;
/**
* Make a copy of the single-byte string. Use this function in the
@@ -301,6 +334,37 @@ getter_Shares(nsXPIDLCString& aXPIDLString)
return nsXPIDLCString::GetterShares(aXPIDLString);
}
// XXX THESE ARE NOT strcmp()! DON'T TRY TO USE THEM AS SUCH!
inline
PRBool
operator==(const char* lhs, const nsXPIDLCString& rhs)
{
return lhs == NS_STATIC_CAST(const char*, rhs);
}
inline
PRBool
operator==(const nsXPIDLCString& lhs, const char* rhs)
{
return NS_STATIC_CAST(const char*, lhs) == rhs;
}
#ifdef HAVE_CPP_TROUBLE_COMPARING_TO_ZERO
inline
PRBool
operator==(int lhs, const nsXPIDLCString& rhs)
{
return NS_REINTERPRET_CAST(char*, lhs) == NS_STATIC_CAST(const char*, rhs);
}
inline
PRBool
operator==(const nsXPIDLCString& lhs, int rhs)
{
return NS_STATIC_CAST(const char*, lhs) == NS_REINTERPRET_CAST(char*, rhs);
}
#endif
#endif // nsXPIDLString_h__