From bdac8fcd97940647dddc644eeb61befd666813a6 Mon Sep 17 00:00:00 2001 From: "dbaron%dbaron.org" Date: Thu, 6 Mar 2008 23:03:50 +0000 Subject: [PATCH] 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 git-svn-id: svn://10.0.0.236/trunk@247255 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/xpcom/glue/nsISupportsImpl.h | 8 ++++---- mozilla/xpcom/glue/nsVoidArray.h | 2 +- mozilla/xpcom/string/public/nsCharTraits.h | 2 +- mozilla/xpcom/string/public/nsTDependentString.h | 8 ++++---- mozilla/xpcom/string/public/nsTDependentSubstring.h | 4 ++-- mozilla/xpcom/string/public/nsTString.h | 2 +- 6 files changed, 13 insertions(+), 13 deletions(-) diff --git a/mozilla/xpcom/glue/nsISupportsImpl.h b/mozilla/xpcom/glue/nsISupportsImpl.h index 663d916d6af..a9e151d3431 100644 --- a/mozilla/xpcom/glue/nsISupportsImpl.h +++ b/mozilla/xpcom/glue/nsISupportsImpl.h @@ -433,18 +433,18 @@ NS_IMETHODIMP _class::QueryInterface(REFNSIID aIID, void** aInstancePtr) \ #define NS_INTERFACE_TABLE_ENTRY(_class, _interface) \ { &_interface::COMTypeInfo::kIID, \ - reinterpret_cast( \ + PROffset32(reinterpret_cast( \ static_cast<_interface*>((_class*) 0x1000)) - \ - reinterpret_cast((_class*) 0x1000) \ + reinterpret_cast((_class*) 0x1000)) \ }, #define NS_INTERFACE_TABLE_ENTRY_AMBIGUOUS(_class, _interface, _implClass) \ { &_interface::COMTypeInfo::kIID, \ - reinterpret_cast( \ + PROffset32(reinterpret_cast( \ static_cast<_interface*>( \ static_cast<_implClass*>( \ (_class*) 0x1000))) - \ - reinterpret_cast((_class*) 0x1000) \ + reinterpret_cast((_class*) 0x1000)) \ }, #define NS_INTERFACE_TABLE_END_WITH_PTR(_ptr) \ diff --git a/mozilla/xpcom/glue/nsVoidArray.h b/mozilla/xpcom/glue/nsVoidArray.h index c8950b4b71e..acd2075d366 100644 --- a/mozilla/xpcom/glue/nsVoidArray.h +++ b/mozilla/xpcom/glue/nsVoidArray.h @@ -406,7 +406,7 @@ private: PRBool HasSingle() const { - return reinterpret_cast(mImpl) & 0x1; + return !!(reinterpret_cast(mImpl) & 0x1); } void* GetSingle() const { diff --git a/mozilla/xpcom/string/public/nsCharTraits.h b/mozilla/xpcom/string/public/nsCharTraits.h index 9667b4f6bcb..3a139795823 100644 --- a/mozilla/xpcom/string/public/nsCharTraits.h +++ b/mozilla/xpcom/string/public/nsCharTraits.h @@ -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 diff --git a/mozilla/xpcom/string/public/nsTDependentString.h b/mozilla/xpcom/string/public/nsTDependentString.h index 7789988692e..1c800ab1c05 100644 --- a/mozilla/xpcom/string/public/nsTDependentString.h +++ b/mozilla/xpcom/string/public/nsTDependentString.h @@ -73,7 +73,7 @@ class nsTDependentString_CharT : public nsTString_CharT */ nsTDependentString_CharT( const char_type* start, const char_type* end ) - : string_type(const_cast(start), end - start, F_TERMINATED) + : string_type(const_cast(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(data), char_traits::length(data), F_TERMINATED) + : string_type(const_cast(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: diff --git a/mozilla/xpcom/string/public/nsTDependentSubstring.h b/mozilla/xpcom/string/public/nsTDependentSubstring.h index 1a3f136e521..0a86a6cec90 100644 --- a/mozilla/xpcom/string/public/nsTDependentSubstring.h +++ b/mozilla/xpcom/string/public/nsTDependentSubstring.h @@ -71,10 +71,10 @@ class nsTDependentSubstring_CharT : public nsTSubstring_CharT } nsTDependentSubstring_CharT( const char_type* start, const char_type* end ) - : substring_type(const_cast(start), end - start, F_NONE) {} + : substring_type(const_cast(start), PRUint32(end - start), F_NONE) {} nsTDependentSubstring_CharT( const const_iterator& start, const const_iterator& end ) - : substring_type(const_cast(start.get()), end.get() - start.get(), F_NONE) {} + : substring_type(const_cast(start.get()), PRUint32(end.get() - start.get()), F_NONE) {} // Create a nsTDependentSubstring to be bound later nsTDependentSubstring_CharT() diff --git a/mozilla/xpcom/string/public/nsTString.h b/mozilla/xpcom/string/public/nsTString.h index 7ce960d55e0..ceb833d4cbb 100644 --- a/mozilla/xpcom/string/public/nsTString.h +++ b/mozilla/xpcom/string/public/nsTString.h @@ -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) {}