From f652fe5b0660e2aabcf8af050fe9c8137544c2c5 Mon Sep 17 00:00:00 2001 From: djfinch Date: Mon, 19 Mar 2018 23:04:19 +0100 Subject: [PATCH] OSX Mem.cpp fix (#70) Thx to @djfinch * OSX Mem.cp fix * Fixed current serverTime overflow. --- index.html | 6 +++--- src/Mem.cpp | 2 +- src/Mem.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/index.html b/index.html index d753b356..277566ea 100644 --- a/index.html +++ b/index.html @@ -89,7 +89,7 @@ $(document).ready(function() { var table = $('#clientStatusList').DataTable({ - dom: "<'row'<'col-sm-9'B><'col-sm-3'f>><'row'<'col-sm-12't>><'row'<'col-sm-10'i><'col-sm-2'<'#serverTime'>>>", + dom: "<'row'<'col-sm-9'B><'col-sm-3'f>><'row'<'col-sm-12't>><'row'<'col-sm-4'i><'col-sm-8'<'#serverTime'>>>", bPaginate: false, ajax: { url: "/admin/getClientStatusList", @@ -329,7 +329,7 @@ currentServerTime = settings.json.current_server_time * 1000; clockDrift = new Date().getTime() - currentServerTime; - $('#serverTime').html("
" + new Date(currentServerTime) + "
"); + $('#serverTime').html("
" + new Date(currentServerTime) + "
"); }); table.on('select', function () { @@ -691,4 +691,4 @@ - \ No newline at end of file + diff --git a/src/Mem.cpp b/src/Mem.cpp index 5d9261d0..a7e0fc8a 100644 --- a/src/Mem.cpp +++ b/src/Mem.cpp @@ -34,7 +34,7 @@ int Mem::m_flags = 0; size_t Mem::m_hashFactor = 1; size_t Mem::m_threads = 0; size_t Mem::m_memorySize = 0; -uint8_t *Mem::m_memory = nullptr; +alignas(16) uint8_t *Mem::m_memory = nullptr; Mem::ThreadBitSet Mem::m_multiHashThreadMask = Mem::ThreadBitSet(-1L); cryptonight_ctx *Mem::create(int threadId) diff --git a/src/Mem.h b/src/Mem.h index 5334f72a..e2048162 100644 --- a/src/Mem.h +++ b/src/Mem.h @@ -27,8 +27,8 @@ #define __MEM_H__ -#include -#include +#include +#include #include #include "Options.h"