projects
/
feisty_meow.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'dev' of feistymeow.org:feisty_meow into dev
[feisty_meow.git]
/
octopi
/
library
/
sockets
/
socket_minder.cpp
diff --git
a/octopi/library/sockets/socket_minder.cpp
b/octopi/library/sockets/socket_minder.cpp
index c99aac96c242fbd7e0389edf70f131c0d6d71c18..e4fc5511fdd937fd2ead375d99de3807fa1f0d8d 100644
(file)
--- a/
octopi/library/sockets/socket_minder.cpp
+++ b/
octopi/library/sockets/socket_minder.cpp
@@
-81,7
+81,7
@@
public:
: ethread(SOCKET_CHECK_INTERVAL, ethread::SLACK_INTERVAL),
_parent(parent)
{
: ethread(SOCKET_CHECK_INTERVAL, ethread::SLACK_INTERVAL),
_parent(parent)
{
- start(N
IL
);
+ start(N
ULL_POINTER
);
}
~socket_minder_prompter() {
}
~socket_minder_prompter() {
@@
-109,7
+109,7
@@
socket_minder::socket_minder(post_office &post, int parent_route,
_pending_sox(new int_set),
_prompter(new socket_minder_prompter(*this))
{
_pending_sox(new int_set),
_prompter(new socket_minder_prompter(*this))
{
- _prompter->start(N
IL
);
+ _prompter->start(N
ULL_POINTER
);
}
socket_minder::~socket_minder()
}
socket_minder::~socket_minder()
@@
-233,13
+233,13
@@
socket_data *socket_minder::lock_socket_data(int socket)
return _socket_list->borrow(i);
// this is a failure to get here; there was no suitable socket.
_lock->unlock();
return _socket_list->borrow(i);
// this is a failure to get here; there was no suitable socket.
_lock->unlock();
- return N
IL
;
+ return N
ULL_POINTER
;
}
void socket_minder::unlock_socket_data(socket_data *to_unlock)
{
if (!to_unlock) return;
}
void socket_minder::unlock_socket_data(socket_data *to_unlock)
{
if (!to_unlock) return;
-//can't affect it now. to_unlock = N
IL
;
+//can't affect it now. to_unlock = N
ULL_POINTER
;
_lock->unlock();
}
_lock->unlock();
}