Fix lots of warnings reported by Clang.

Mostly potentially lossy implicit conversions in headers (long->int). Also dangling else warnings. Struct/class mismatches.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74473 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2013-07-10 16:41:34 +00:00
parent 8778519200
commit 17473a770a
23 changed files with 69 additions and 68 deletions

View File

@@ -483,8 +483,9 @@ inline bool grow_lf70( size_t buckets, size_t items )
#ifndef wxNEEDS_WX_HASH_MAP
// integer types
class WXDLLIMPEXP_BASE wxIntegerHash
struct WXDLLIMPEXP_BASE wxIntegerHash
{
private:
WX_HASH_MAP_NAMESPACE::hash<long> longHash;
WX_HASH_MAP_NAMESPACE::hash<unsigned long> ulongHash;
WX_HASH_MAP_NAMESPACE::hash<int> intHash;
@@ -527,9 +528,8 @@ public:
#else // wxNEEDS_WX_HASH_MAP
// integer types
class WXDLLIMPEXP_BASE wxIntegerHash
struct WXDLLIMPEXP_BASE wxIntegerHash
{
public:
wxIntegerHash() { }
unsigned long operator()( long x ) const { return (unsigned long)x; }
unsigned long operator()( unsigned long x ) const { return x; }
@@ -547,9 +547,8 @@ public:
#endif // !wxNEEDS_WX_HASH_MAP/wxNEEDS_WX_HASH_MAP
class WXDLLIMPEXP_BASE wxIntegerEqual
struct WXDLLIMPEXP_BASE wxIntegerEqual
{
public:
wxIntegerEqual() { }
bool operator()( long a, long b ) const { return a == b; }
bool operator()( unsigned long a, unsigned long b ) const { return a == b; }
@@ -566,9 +565,8 @@ public:
};
// pointers
class WXDLLIMPEXP_BASE wxPointerHash
struct WXDLLIMPEXP_BASE wxPointerHash
{
public:
wxPointerHash() { }
#ifdef wxNEEDS_WX_HASH_MAP
@@ -580,9 +578,8 @@ public:
wxPointerHash& operator=(const wxPointerHash&) { return *this; }
};
class WXDLLIMPEXP_BASE wxPointerEqual
struct WXDLLIMPEXP_BASE wxPointerEqual
{
public:
wxPointerEqual() { }
bool operator()( const void* a, const void* b ) const { return a == b; }
@@ -590,9 +587,8 @@ public:
};
// wxString, char*, wchar_t*
class WXDLLIMPEXP_BASE wxStringHash
struct WXDLLIMPEXP_BASE wxStringHash
{
public:
wxStringHash() {}
unsigned long operator()( const wxString& x ) const
{ return stringHash( x.wx_str() ); }
@@ -616,9 +612,8 @@ public:
wxStringHash& operator=(const wxStringHash&) { return *this; }
};
class WXDLLIMPEXP_BASE wxStringEqual
struct WXDLLIMPEXP_BASE wxStringEqual
{
public:
wxStringEqual() {}
bool operator()( const wxString& a, const wxString& b ) const
{ return a == b; }