Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove MSVC6 support.

Browse Source 
Don't support this compiler any more, this allows to get rid of tons of
MSVC6-specific workarounds, in particular we can now use Bind() and natural
template functions calls in the library code.

Also remove MSVC6 project and solution files and don't generate them when
bakefile_gen is ran any more (removing the remaining occurrences of msvc6prj
from the bakefiles results in weird bake-time errors, so it's simpler to just
leave them there).

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@76532 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2014-05-15 22:32:17 +00:00
parent 28f9670787
commit f4b80e5337
289 changed files with 394 additions and 38949 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/common/sckaddr.cpp
View File

@@ -418,10 +418,6 @@ servent *wxGetservbyname_r(const char *port,
// wxSockAddressImpl implementation
// ============================================================================
// FIXME-VC6: helper macros to call Alloc/Get() hiding the ugly dummy argument
#define ALLOC(T) Alloc(static_cast<T *>(NULL))
#define GET(T) Get(static_cast<T *>(NULL))
// ----------------------------------------------------------------------------
// INET or INET6 address family
// ----------------------------------------------------------------------------
@@ -434,14 +430,14 @@ wxString wxSockAddressImpl::GetHostName() const
#if wxUSE_IPV6
if ( m_family == FAMILY_INET6 )
{
sockaddr_in6 * const addr6 = GET(sockaddr_in6);
sockaddr_in6 * const addr6 = Get<sockaddr_in6>();
addrbuf = &addr6->sin6_addr;
addrbuflen = sizeof(addr6->sin6_addr);
}
else
#endif // wxUSE_IPV6
{
sockaddr_in * const addr = GET(sockaddr_in);
sockaddr_in * const addr = Get<sockaddr_in>();
if ( !addr )
return wxString();
@@ -504,13 +500,13 @@ void wxSockAddressImpl::CreateINET()
wxASSERT_MSG( Is(FAMILY_UNSPEC), "recreating address as different type?" );
m_family = FAMILY_INET;
sockaddr_in * const addr = ALLOC(sockaddr_in);
sockaddr_in * const addr = Alloc<sockaddr_in>();
addr->sin_family = FAMILY_INET;
}
bool wxSockAddressImpl::SetHostName4(const wxString& name)
{
sockaddr_in * const addr = GET(sockaddr_in);
sockaddr_in * const addr = Get<sockaddr_in>();
if ( !addr )
return false;
@@ -541,7 +537,7 @@ bool wxSockAddressImpl::SetHostName4(const wxString& name)
bool wxSockAddressImpl::GetHostAddress(wxUint32 *address) const
{
sockaddr_in * const addr = GET(sockaddr_in);
sockaddr_in * const addr = Get<sockaddr_in>();
if ( !addr )
return false;
@@ -552,7 +548,7 @@ bool wxSockAddressImpl::GetHostAddress(wxUint32 *address) const
bool wxSockAddressImpl::SetHostAddress(wxUint32 address)
{
sockaddr_in * const addr = GET(sockaddr_in);
sockaddr_in * const addr = Get<sockaddr_in>();
if ( !addr )
return false;
@@ -563,7 +559,7 @@ bool wxSockAddressImpl::SetHostAddress(wxUint32 address)
wxUint16 wxSockAddressImpl::GetPort4() const
{
sockaddr_in * const addr = GET(sockaddr_in);
sockaddr_in * const addr = Get<sockaddr_in>();
if ( !addr )
return 0;
@@ -572,7 +568,7 @@ wxUint16 wxSockAddressImpl::GetPort4() const
bool wxSockAddressImpl::SetPort4(wxUint16 port)
{
sockaddr_in * const addr = GET(sockaddr_in);
sockaddr_in * const addr = Get<sockaddr_in>();
if ( !addr )
return false;
@@ -592,13 +588,13 @@ void wxSockAddressImpl::CreateINET6()
wxASSERT_MSG( Is(FAMILY_UNSPEC), "recreating address as different type?" );
m_family = FAMILY_INET6;
sockaddr_in6 * const addr = ALLOC(sockaddr_in6);
sockaddr_in6 * const addr = Alloc<sockaddr_in6>();
addr->sin6_family = FAMILY_INET6;
}
bool wxSockAddressImpl::SetHostName6(const wxString& hostname)
{
sockaddr_in6 * const addr = GET(sockaddr_in6);
sockaddr_in6 * const addr = Get<sockaddr_in6>();
if ( !addr )
return false;
@@ -626,7 +622,7 @@ bool wxSockAddressImpl::SetHostName6(const wxString& hostname)
bool wxSockAddressImpl::GetHostAddress(in6_addr *address) const
{
sockaddr_in6 * const addr = GET(sockaddr_in6);
sockaddr_in6 * const addr = Get<sockaddr_in6>();
if ( !addr )
return false;
@@ -637,7 +633,7 @@ bool wxSockAddressImpl::GetHostAddress(in6_addr *address) const
bool wxSockAddressImpl::SetHostAddress(const in6_addr& address)
{
sockaddr_in6 * const addr = GET(sockaddr_in6);
sockaddr_in6 * const addr = Get<sockaddr_in6>();
if ( !addr )
return false;
@@ -648,7 +644,7 @@ bool wxSockAddressImpl::SetHostAddress(const in6_addr& address)
wxUint16 wxSockAddressImpl::GetPort6() const
{
sockaddr_in6 * const addr = GET(sockaddr_in6);
sockaddr_in6 * const addr = Get<sockaddr_in6>();
if ( !addr )
return 0;
@@ -657,7 +653,7 @@ wxUint16 wxSockAddressImpl::GetPort6() const
bool wxSockAddressImpl::SetPort6(wxUint16 port)
{
sockaddr_in6 * const addr = GET(sockaddr_in6);
sockaddr_in6 * const addr = Get<sockaddr_in6>();
if ( !addr )
return false;
@@ -690,14 +686,14 @@ void wxSockAddressImpl::CreateUnix()
wxASSERT_MSG( Is(FAMILY_UNSPEC), "recreating address as different type?" );
m_family = FAMILY_UNIX;
sockaddr_un * const addr = ALLOC(sockaddr_un);
sockaddr_un * const addr = Alloc<sockaddr_un>();
addr->sun_family = FAMILY_UNIX;
addr->sun_path[0] = '\0';
}
bool wxSockAddressImpl::SetPath(const wxString& path)
{
sockaddr_un * const addr = GET(sockaddr_un);
sockaddr_un * const addr = Get<sockaddr_un>();
if ( !addr )
return false;
@@ -712,7 +708,7 @@ bool wxSockAddressImpl::SetPath(const wxString& path)
wxString wxSockAddressImpl::GetPath() const
{
sockaddr_un * const addr = GET(sockaddr_un);
sockaddr_un * const addr = Get<sockaddr_un>();
if ( !addr )
return wxString();
@@ -721,9 +717,6 @@ wxString wxSockAddressImpl::GetPath() const
#endif // wxHAS_UNIX_DOMAIN_SOCKETS
#undef GET
#undef ALLOC
// ----------------------------------------------------------------------------
// wxSockAddress
// ----------------------------------------------------------------------------