Use the auto type to shorten long declarations

[libs/net.git] / source / net / resolve.cpp

diff --git a/source/net/resolve.cpp b/source/net/resolve.cpp
index 10e8c656797fedfdd685b2edb48ad5f20a217996..c30d62a7bd9f471f1d621477d5f3536fc39e4adf 100644 (file)
--- a/source/net/resolve.cpp
+++ b/source/net/resolve.cpp
@@ -132,7 +132,16 @@ void Resolver::task_done()
                if(task->addr)
                        signal_address_resolved.emit(task->tag, *task->addr);
                else if(task->error)
+               {
+                       if(signal_resolve_failed.empty())
+                       {
+                               RefPtr<runtime_error> err = task->error;
+                               task->error = 0;
+                               thread.pop_complete_task();
+                               throw *err;
+                       }
                        signal_resolve_failed.emit(task->tag, *task->error);
+               }
                thread.pop_complete_task();
        }
 }
@@ -202,7 +211,7 @@ void Resolver::WorkerThread::main()
                Task *task = 0;
                {
                        MutexLock lock(queue_mutex);
-                       for(list<Task>::iterator i=queue.begin(); (!task && i!=queue.end()); ++i)
+                       for(auto i=queue.begin(); (!task && i!=queue.end()); ++i)
                                if(!i->is_complete())
                                        task = &*i;
                }