diff options
| author | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2012-09-01 10:04:05 -0700 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2012-09-01 10:27:52 -0700 |
| commit | 4a893f72cadaa875a920db8949171b002f656e43 (patch) | |
| tree | 1e08a3cb6f579cab9c3c9a138d36ababdf76121b /includes/Socket.h | |
| parent | 56d91ddd2cd42b782cde0bb3fdf4eb9ebe7597be (diff) | |
| parent | 06674e57649d536cf19715524ee40c5ad4a9026d (diff) | |
Merge commit '06674e57649d536cf19715524ee40c5ad4a9026d'
Conflicts:
includes/LuaTask.h
includes/TaskMan.h
includes/Threads.h
src/TaskMan.cc
src/Threads.cc
Diffstat (limited to 'includes/Socket.h')
| -rw-r--r-- | includes/Socket.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/includes/Socket.h b/includes/Socket.h index b113e43..e5a9f21 100644 --- a/includes/Socket.h +++ b/includes/Socket.h @@ -50,9 +50,9 @@ class Socket : public Handle { int m_fd; String m_name; - bool m_connected; - bool m_connecting; - bool m_listening; + bool m_connected = false; + bool m_connecting = false; + bool m_listening = false; sockaddr_in6 m_localAddr, m_remoteAddr; SocketEvent * m_evtR, * m_evtW; }; |