summaryrefslogtreecommitdiffstats
path: root/xmrstak/misc
diff options
context:
space:
mode:
authorpsychocrypt <psychocryptHPC@gmail.com>2018-04-14 22:09:39 +0200
committerTimothy Pearson <tpearson@raptorengineering.com>2018-06-04 21:07:11 +0000
commit6f0da67d4f01581b0ef8ec1bdd921a8a05d01c57 (patch)
tree4c47bdb46d4ca419ad3a7c1597791e40fb0f0ced /xmrstak/misc
parent5dbb3075f5f2a960ca4874886b07651791e1fddb (diff)
downloadxmr-stak-6f0da67d4f01581b0ef8ec1bdd921a8a05d01c57.zip
xmr-stak-6f0da67d4f01581b0ef8ec1bdd921a8a05d01c57.tar.gz
fix a few conversion warnings
- fix conversion from large type tp small
Diffstat (limited to 'xmrstak/misc')
-rw-r--r--xmrstak/misc/console.cpp4
-rw-r--r--xmrstak/misc/console.hpp2
-rw-r--r--xmrstak/misc/telemetry.cpp4
3 files changed, 5 insertions, 5 deletions
diff --git a/xmrstak/misc/console.cpp b/xmrstak/misc/console.cpp
index de5eed3..d961b71 100644
--- a/xmrstak/misc/console.cpp
+++ b/xmrstak/misc/console.cpp
@@ -225,7 +225,7 @@ void printer::print_str(const char* str)
//Do a press any key for the windows folk. *insert any key joke here*
#ifdef _WIN32
-void win_exit(size_t code)
+void win_exit(int code)
{
size_t envSize = 0;
getenv_s(&envSize, nullptr, 0, "XMRSTAK_NOWAIT");
@@ -238,7 +238,7 @@ void win_exit(size_t code)
}
#else
-void win_exit(size_t code)
+void win_exit(int code)
{
std::exit(code);
}
diff --git a/xmrstak/misc/console.hpp b/xmrstak/misc/console.hpp
index cfbeddd..6717631 100644
--- a/xmrstak/misc/console.hpp
+++ b/xmrstak/misc/console.hpp
@@ -49,4 +49,4 @@ private:
FILE* logfile;
};
-void win_exit(size_t code = 1);
+void win_exit(int code = 1);
diff --git a/xmrstak/misc/telemetry.cpp b/xmrstak/misc/telemetry.cpp
index 28fb522..a3a2a12 100644
--- a/xmrstak/misc/telemetry.cpp
+++ b/xmrstak/misc/telemetry.cpp
@@ -89,8 +89,8 @@ double telemetry::calc_telemetry_data(size_t iLastMilisec, size_t iThread)
return nan("");
double fHashes, fTime;
- fHashes = iLastestHashCnt - iEarliestHashCnt;
- fTime = iLastestStamp - iEarliestStamp;
+ fHashes = static_cast<double>(iLastestHashCnt - iEarliestHashCnt);
+ fTime = static_cast<double>(iLastestStamp - iEarliestStamp);
fTime /= 1000.0;
return fHashes / fTime;
OpenPOWER on IntegriCloud