Unconditional assert means fail.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@38276 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Włodzimierz Skiba
2006-03-22 17:55:05 +00:00
parent c31be54ae0
commit 7fb0a11d3a

View File

@@ -1,12 +1,12 @@
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// Name: socket.cpp // Name: src/common/socket.cpp
// Purpose: Socket handler classes // Purpose: Socket handler classes
// Authors: Guilhem Lavaux, Guillermo Rodriguez Garcia // Authors: Guilhem Lavaux, Guillermo Rodriguez Garcia
// Created: April 1997 // Created: April 1997
// Copyright: (C) 1999-1997, Guilhem Lavaux // Copyright: (C) 1999-1997, Guilhem Lavaux
// (C) 2000-1999, Guillermo Rodriguez Garcia // (C) 2000-1999, Guillermo Rodriguez Garcia
// RCS_ID: $Id$ // RCS_ID: $Id$
// License: see wxWindows licence // License: wxWindows licence
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////
// ========================================================================== // ==========================================================================
@@ -24,7 +24,6 @@
#include "wx/app.h" #include "wx/app.h"
#include "wx/apptrait.h" #include "wx/apptrait.h"
#include "wx/defs.h"
#include "wx/object.h" #include "wx/object.h"
#include "wx/string.h" #include "wx/string.h"
#include "wx/timer.h" #include "wx/timer.h"
@@ -1345,7 +1344,7 @@ wxDatagramSocket::wxDatagramSocket( const wxSockAddress& addr,
if(!m_socket) if(!m_socket)
{ {
wxASSERT_MSG( 0, _T("datagram socket not new'd") ); wxFAIL_MSG( _T("datagram socket not new'd") );
return; return;
} }
// Setup the socket as non connection oriented // Setup the socket as non connection oriented
@@ -1364,7 +1363,6 @@ wxDatagramSocket::wxDatagramSocket( const wxSockAddress& addr,
m_socket->SetCallback( GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG | m_socket->SetCallback( GSOCK_INPUT_FLAG | GSOCK_OUTPUT_FLAG |
GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG, GSOCK_LOST_FLAG | GSOCK_CONNECTION_FLAG,
wx_socket_callback, (char*)this ); wx_socket_callback, (char*)this );
} }
wxDatagramSocket& wxDatagramSocket::RecvFrom( wxSockAddress& addr, wxDatagramSocket& wxDatagramSocket::RecvFrom( wxSockAddress& addr,
@@ -1414,5 +1412,3 @@ IMPLEMENT_DYNAMIC_CLASS(wxSocketModule, wxModule)
#endif #endif
// wxUSE_SOCKETS // wxUSE_SOCKETS
// vi:sts=4:sw=4:et