From dde65a6040fd31154f2674b190ab58a65fa74a33 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 12 Jul 2008 02:12:58 +0000
Subject: [PATCH] no changes, just removed the unnecessary inline keywords
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@54587 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
include/wx/socket.h | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/include/wx/socket.h b/include/wx/socket.h
index 280cfab15a..a07c7bf6fb 100644
--- a/include/wx/socket.h
+++ b/include/wx/socket.h
@@ -110,14 +110,14 @@ public:
bool Destroy();
// state
- inline bool Ok() const { return IsOk(); }
- inline bool IsOk() const { return (m_socket != NULL); }
- inline bool Error() const { return m_error; }
- inline bool IsConnected() const { return m_connected; }
- inline bool IsData() { return WaitForRead(0, 0); }
- inline bool IsDisconnected() const { return !IsConnected(); }
- inline wxUint32 LastCount() const { return m_lcount; }
- inline wxSocketError LastError() const { return (wxSocketError)m_socket->GetError(); }
+ bool Ok() const { return IsOk(); }
+ bool IsOk() const { return (m_socket != NULL); }
+ bool Error() const { return m_error; }
+ bool IsConnected() const { return m_connected; }
+ bool IsData() { return WaitForRead(0, 0); }
+ bool IsDisconnected() const { return !IsConnected(); }
+ wxUint32 LastCount() const { return m_lcount; }
+ wxSocketError LastError() const { return (wxSocketError)m_socket->GetError(); }
void SaveState();
void RestoreState();
@@ -142,13 +142,13 @@ public:
bool WaitForWrite(long seconds = -1, long milliseconds = 0);
bool WaitForLost(long seconds = -1, long milliseconds = 0);
- inline wxSocketFlags GetFlags() const { return m_flags; }
+ wxSocketFlags GetFlags() const { return m_flags; }
void SetFlags(wxSocketFlags flags);
void SetTimeout(long seconds);
bool GetOption(int level, int optname, void *optval, int *optlen);
bool SetOption(int level, int optname, const void *optval, int optlen);
- inline wxUint32 GetLastIOSize() const { return m_lcount; }
+ wxUint32 GetLastIOSize() const { return m_lcount; }
// event handling
void *GetClientData() const { return m_clientData; }
@@ -170,8 +170,8 @@ public:
void OnRequest(wxSocketNotify notify);
// do not use, not documented nor supported
- inline bool IsNoWait() const { return ((m_flags & wxSOCKET_NOWAIT) != 0); }
- inline wxSocketType GetType() const { return m_type; }
+ bool IsNoWait() const { return ((m_flags & wxSOCKET_NOWAIT) != 0); }
+ wxSocketType GetType() const { return m_type; }
private:
friend class wxSocketClient;
--
2.47.2