Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'github/master' into curlthreading3

Browse Source 
Conflicts:
	indra/aistatemachine/aistatemachine.cpp
This commit is contained in:
Aleric Inglewood
2012-09-22 01:25:54 +02:00
parent 2d12a82a54 5bcb350d89
commit 1254a7bbe2
14 changed files with 36 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
indra/aistatemachine/aicurlthread.cpp
View File

@@ -1382,7 +1382,7 @@ char const* action_str(int action)
//static
int MultiHandle::socket_callback(CURL* easy, curl_socket_t s, int action, void* userp, void* socketp)
{
DoutEntering(dc::curl, "MultiHandle::socket_callback(" << (void*)easy << ", " << s << ", " << action_str(action) << ", " << (void*)userp << ", " << (void*)socketp << ")");
DoutEntering(dc::curl, "MultiHandle::socket_callback((CURL*)" << (void*)easy << ", " << s << ", " << action_str(action) << ", " << (void*)userp << ", " << (void*)socketp << ")");
MultiHandle& self = *static_cast<MultiHandle*>(userp);
CurlSocketInfo* sock_info = static_cast<CurlSocketInfo*>(socketp);
if (action == CURL_POLL_REMOVE)