diff options
| author | Jeffrey <jeffryan@tamu.edu> | 2022-03-07 19:16:26 -0600 |
|---|---|---|
| committer | Jeffrey <jeffryan@tamu.edu> | 2022-04-18 09:55:21 -0500 |
| commit | 441c86073869c5df55e91c39fd4b331212512022 (patch) | |
| tree | 18129814dc6b2bd30567c758623f3d60b6e5093d /src | |
| parent | Add Include statements (diff) | |
| download | monero-441c86073869c5df55e91c39fd4b331212512022.tar.xz | |
Merge functionality of misc_os_dependent into time_helper.h
Actions:
1. Remove unused functions from misc_os_dependent.h
2. Move three remaining functions, get_gmt_time, get_ns_count, and get_tick_count into time_helper.h
3. Remove unused functions from time_helper.h
4. Refactor get_ns_count and get_internet_time_str and get_time_interval_string
5. Remove/add includes as needed
Relevant commits on the old PR:
a9fbe52b02ffab451e90c977459fea4642731cd1
9a59b131c4ed1be8afe238fff3780fe203c65a46
7fa9e2817df9b9ef3f0290f7f86357939829e588
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/perf_timer.cpp | 2 | ||||
| -rw-r--r-- | src/common/util.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/common/perf_timer.cpp b/src/common/perf_timer.cpp index 1152bf25a..30164a557 100644 --- a/src/common/perf_timer.cpp +++ b/src/common/perf_timer.cpp @@ -27,7 +27,7 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include <vector> -#include "misc_os_dependent.h" +#include "time_helper.h" #include "perf_timer.h" #undef MONERO_DEFAULT_LOG_CATEGORY diff --git a/src/common/util.cpp b/src/common/util.cpp index d607d8f7f..89dcf4fef 100644 --- a/src/common/util.cpp +++ b/src/common/util.cpp @@ -59,7 +59,7 @@ #include "include_base_utils.h" #include "file_io_utils.h" #include "wipeable_string.h" -#include "misc_os_dependent.h" +#include "time_helper.h" using namespace epee; #include "crypto/crypto.h" |