From 1d15e3be1833f302cf478dfb68210365af9d1b67 Mon Sep 17 00:00:00 2001 From: WerWolv Date: Thu, 12 Nov 2020 22:22:33 +0100 Subject: [PATCH] Get ready for linux build --- include/hex.hpp | 1 + include/views/view_hexeditor.hpp | 3 --- source/views/view_information.cpp | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/include/hex.hpp b/include/hex.hpp index 217dce9f0..2fa60bbfb 100644 --- a/include/hex.hpp +++ b/include/hex.hpp @@ -1,6 +1,7 @@ #pragma once #include +#include using u8 = std::uint8_t; using u16 = std::uint16_t; diff --git a/include/views/view_hexeditor.hpp b/include/views/view_hexeditor.hpp index a09ac2301..b8c5b801f 100644 --- a/include/views/view_hexeditor.hpp +++ b/include/views/view_hexeditor.hpp @@ -1,8 +1,5 @@ #pragma once -#include -#include - #include "utils.hpp" #include "views/view.hpp" diff --git a/source/views/view_information.cpp b/source/views/view_information.cpp index 99984f429..c8cc4317c 100644 --- a/source/views/view_information.cpp +++ b/source/views/view_information.cpp @@ -61,7 +61,7 @@ namespace hex { for (u64 i = 0; i < this->m_dataProvider->getSize(); i += 512) { std::array blockValueCounts = { 0 }; - this->m_dataProvider->read(i, buffer.data(), std::min(512ULL, this->m_dataProvider->getSize() - i)); + this->m_dataProvider->read(i, buffer.data(), std::min(size_t(512), this->m_dataProvider->getSize() - i)); for (u16 j = 0; j < 512; j++) { blockValueCounts[buffer[j]]++;