diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-01-06 20:16:56 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-01-06 20:32:45 +0100 |
| commit | 729ba317498bf644c62975dbde07da5ab9ef0043 (patch) | |
| tree | 84076d547fd499ff98cffac6a9343bccfb451081 /src/qt | |
| parent | 3b95808428c16b2276cf1a6416d0c01ae515e81a (diff) | |
| parent | 856e862f4a736fbdc38daae3b7f0fa34e1da317c (diff) | |
| download | bitcoin-729ba317498bf644c62975dbde07da5ab9ef0043.tar.xz | |
Merge pull request #5513
856e862 namespace: drop most boost namespaces and a few header cleanups (Cory Fields)
9b1ab86 namespace: drop boost::assign altogether here (Cory Fields)
a324199 namespace: remove boost namespace pollution (Cory Fields)
Diffstat (limited to 'src/qt')
| -rw-r--r-- | src/qt/paymentserver.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp index b3dbb693d7..66331ee4b4 100644 --- a/src/qt/paymentserver.cpp +++ b/src/qt/paymentserver.cpp @@ -46,7 +46,6 @@ #include <QUrlQuery> #endif -using namespace boost; using namespace std; const int BITCOIN_IPC_CONNECT_TIMEOUT = 1000; // milliseconds |