diff options
| author | Pieter Wuille <[email protected]> | 2013-11-10 19:19:30 +0100 |
|---|---|---|
| committer | Pieter Wuille <[email protected]> | 2013-11-10 19:21:03 +0100 |
| commit | f76c122e2eac8ef66f69d142231bd33c88a24c50 (patch) | |
| tree | d2f910390e55aef857023812fbdaefdd66cd99ff /src/alert.cpp | |
| parent | Merge pull request #3211 (diff) | |
| parent | Cleanup code using forward declarations. (diff) | |
| download | discoin-f76c122e2eac8ef66f69d142231bd33c88a24c50.tar.xz discoin-f76c122e2eac8ef66f69d142231bd33c88a24c50.zip | |
Merge pull request #2767
51ed9ec Cleanup code using forward declarations. (Brandon Dahler)
Diffstat (limited to 'src/alert.cpp')
| -rw-r--r-- | src/alert.cpp | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/src/alert.cpp b/src/alert.cpp index c9cde1795..b900fe41e 100644 --- a/src/alert.cpp +++ b/src/alert.cpp @@ -2,17 +2,20 @@ // Alert system // -#include <algorithm> -#include <boost/algorithm/string/classification.hpp> -#include <boost/algorithm/string/replace.hpp> -#include <boost/foreach.hpp> -#include <map> - #include "alert.h" + #include "key.h" #include "net.h" -#include "sync.h" #include "ui_interface.h" +#include "util.h" + +#include <algorithm> +#include <inttypes.h> +#include <map> + +#include <boost/algorithm/string/classification.hpp> +#include <boost/algorithm/string/replace.hpp> +#include <boost/foreach.hpp> using namespace std; @@ -48,8 +51,8 @@ std::string CUnsignedAlert::ToString() const return strprintf( "CAlert(\n" " nVersion = %d\n" - " nRelayUntil = %"PRI64d"\n" - " nExpiration = %"PRI64d"\n" + " nRelayUntil = %"PRId64"\n" + " nExpiration = %"PRId64"\n" " nID = %d\n" " nCancel = %d\n" " setCancel = %s\n" |