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

Fix -Wconversion warnings that prevent compiling netwerk/cookie/src/ (which makes warnings fatal) with gcc 4.3 on x86_64. b=409384 r=bsmedberg a=beltzner

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@247255 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
dbaron%dbaron.org
2008-03-06 23:03:50 +00:00
parent f4e51c2f77
commit bdac8fcd97
6 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mozilla/xpcom/glue/nsISupportsImpl.h
View File

@@ -433,18 +433,18 @@ NS_IMETHODIMP _class::QueryInterface(REFNSIID aIID, void** aInstancePtr) \
#define NS_INTERFACE_TABLE_ENTRY(_class, _interface) \
{ &_interface::COMTypeInfo<int>::kIID, \
reinterpret_cast<char*>( \
PROffset32(reinterpret_cast<char*>( \
static_cast<_interface*>((_class*) 0x1000)) - \
reinterpret_cast<char*>((_class*) 0x1000) \
reinterpret_cast<char*>((_class*) 0x1000)) \
},
#define NS_INTERFACE_TABLE_ENTRY_AMBIGUOUS(_class, _interface, _implClass) \
{ &_interface::COMTypeInfo<int>::kIID, \
reinterpret_cast<char*>( \
PROffset32(reinterpret_cast<char*>( \
static_cast<_interface*>( \
static_cast<_implClass*>( \
(_class*) 0x1000))) - \
reinterpret_cast<char*>((_class*) 0x1000) \
reinterpret_cast<char*>((_class*) 0x1000)) \
},
#define NS_INTERFACE_TABLE_END_WITH_PTR(_ptr) \

2
mozilla/xpcom/glue/nsVoidArray.h
View File

@@ -406,7 +406,7 @@ private:
PRBool HasSingle() const
{
return reinterpret_cast<PRWord>(mImpl) & 0x1;
return !!(reinterpret_cast<PRWord>(mImpl) & 0x1);
}
void* GetSingle() const
{

2
mozilla/xpcom/string/public/nsCharTraits.h
View File

@@ -671,7 +671,7 @@ struct nsCharSourceTraits
readable_distance( const InputIterator& first, const InputIterator& last )
{
// assumes single fragment
return last.get() - first.get();
return PRUint32(last.get() - first.get());
}
static

8
mozilla/xpcom/string/public/nsTDependentString.h
View File

@@ -73,7 +73,7 @@ class nsTDependentString_CharT : public nsTString_CharT
*/
nsTDependentString_CharT( const char_type* start, const char_type* end )
: string_type(const_cast<char_type*>(start), end - start, F_TERMINATED)
: string_type(const_cast<char_type*>(start), PRUint32(end - start), F_TERMINATED)
{
AssertValid();
}
@@ -86,7 +86,7 @@ class nsTDependentString_CharT : public nsTString_CharT
explicit
nsTDependentString_CharT( const char_type* data )
: string_type(const_cast<char_type*>(data), char_traits::length(data), F_TERMINATED)
: string_type(const_cast<char_type*>(data), PRUint32(char_traits::length(data)), F_TERMINATED)
{
AssertValid();
}
@@ -114,14 +114,14 @@ class nsTDependentString_CharT : public nsTString_CharT
void Rebind( const char_type* data )
{
Rebind(data, char_traits::length(data));
Rebind(data, PRUint32(char_traits::length(data)));
}
NS_COM void Rebind( const char_type* data, size_type length );
void Rebind( const char_type* start, const char_type* end )
{
Rebind(start, end - start);
Rebind(start, PRUint32(end - start));
}
private:

4
mozilla/xpcom/string/public/nsTDependentSubstring.h
View File

@@ -71,10 +71,10 @@ class nsTDependentSubstring_CharT : public nsTSubstring_CharT
}
nsTDependentSubstring_CharT( const char_type* start, const char_type* end )
: substring_type(const_cast<char_type*>(start), end - start, F_NONE) {}
: substring_type(const_cast<char_type*>(start), PRUint32(end - start), F_NONE) {}
nsTDependentSubstring_CharT( const const_iterator& start, const const_iterator& end )
: substring_type(const_cast<char_type*>(start.get()), end.get() - start.get(), F_NONE) {}
: substring_type(const_cast<char_type*>(start.get()), PRUint32(end.get() - start.get()), F_NONE) {}
// Create a nsTDependentSubstring to be bound later
nsTDependentSubstring_CharT()

2
mozilla/xpcom/string/public/nsTString.h
View File

@@ -449,7 +449,7 @@ class nsTFixedString_CharT : public nsTString_CharT
*/
nsTFixedString_CharT( char_type* data, size_type storageSize )
: string_type(data, char_traits::length(data), F_TERMINATED | F_FIXED | F_CLASS_FIXED)
: string_type(data, PRUint32(char_traits::length(data)), F_TERMINATED | F_FIXED | F_CLASS_FIXED)
, mFixedCapacity(storageSize - 1)
, mFixedBuf(data)
{}