diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2022-04-18 12:13:32 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2022-04-18 12:13:32 -0500 |
| commit | 53bf62d11457b011ac77d6d2947e662259cfec5e (patch) | |
| tree | 7067e3a6f538ba7bdb2434cedb414dd6063f3087 /src/common | |
| parent | Merge pull request #8207 (diff) | |
| parent | "Change C-cast to static_cast in net_peerlist.h" (diff) | |
| download | monero-53bf62d11457b011ac77d6d2947e662259cfec5e.tar.xz | |
Merge pull request #8211
1137142 Change C-cast to static_cast in net_peerlist.h (Jeffrey)
175b411 Change C-style-casts to static_cast in time_helper.h (Jeffrey)
b49ed59 Remove the only 4 non-UTF8 characters in codebase (Jeffrey)
1f25aa2 Factor out move_it_backward from misc_language.h (Jeffrey)
7764d69 Move copyable_atomic into connection_context (Jeffrey)
801568d Refactor out to_nonconst_iterator.h (Jeffrey)
87ec36c Refactor out pragma_comp_defs (Jeffrey)
441c860 Merge functionality of misc_os_dependent into time_helper.h (Jeffrey)
40f02f9 Add Include statements (Jeffrey)
12b1b74 Trimming Fat (Jeffrey
690ce56 Boring Old Deletes (Jeffrey)
Diffstat (limited to 'src/common')
| -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" |