From f19821dae118060dff26c4c2370402d9dae8ed17 Mon Sep 17 00:00:00 2001 From: Daniel Larimer Date: Mon, 28 Jan 2013 11:47:33 -0500 Subject: [PATCH] fix timestamp in error reports --- include/fc/error_report.hpp | 2 +- src/error_report.cpp | 3 ++- vendor/CMakeLists.txt | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/fc/error_report.hpp b/include/fc/error_report.hpp index 7b088d7..57dc7ef 100644 --- a/include/fc/error_report.hpp +++ b/include/fc/error_report.hpp @@ -27,7 +27,7 @@ namespace fc { fc::string file; int64_t line; fc::string method; - uint64_t time; + fc::string time; fc::optional meta; }; typedef fc::vector error_context; diff --git a/src/error_report.cpp b/src/error_report.cpp index c66e6d3..4d1f2d7 100644 --- a/src/error_report.cpp +++ b/src/error_report.cpp @@ -3,11 +3,12 @@ #include #include #include +#include #include namespace fc { error_frame::error_frame( const fc::string& f, uint64_t l, const fc::string& m, const fc::string& d, fc::value met ) -:desc(d),file(fc::path(f).filename().generic_string()),line(l),method(m),meta(fc::move(met)){} +:desc(d),file(fc::path(f).filename().generic_string()),line(l),method(m),meta(fc::move(met)),time(fc::time_point::now()){} error_report::error_report() { diff --git a/vendor/CMakeLists.txt b/vendor/CMakeLists.txt index 16ac56b..b12310e 100644 --- a/vendor/CMakeLists.txt +++ b/vendor/CMakeLists.txt @@ -1,3 +1,3 @@ add_subdirectory( libssh2-1.4.2 ) #add_subdirectory( zlib-1.2.7) -#add_subdirectory( sigar ) +add_subdirectory( sigar )