Mercurial > hg > bitcoin

changeset 2955:c75b347b2fc9 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge branch '0.5.x' into 0.6.0.x
author Luke Dashjr <luke-jr+git@utopios.org>
date Fri, 27 Apr 2012 16:28:00 -0400
parents 745ef072286e (current diff) e128a56635d5 (diff)
children 3fdb45ee3bc2 5bbf07d11935
files src/bitcoinrpc.cpp
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/bitcoinrpc.cpp
+++ b/src/bitcoinrpc.cpp
@@ -2421,7 +2421,7 @@
         acceptor.bind(endpoint);
         acceptor.listen(socket_base::max_connections);
     }
-    catch(system::system_error &e)
+    catch(boost::system::system_error &e)
     {
         HACK_SHUTDOWN = true;
         ThreadSafeMessageBox(strprintf(_("An error occured while setting up the RPC port %i for listening: %s"), endpoint.port(), e.what()),