Commit b1fe2355 authored by Martin Marinov's avatar Martin Marinov
Browse files

Merge remote-tracking branch 'ReForm/master' into merge-from-ReForm, includes...

Merge remote-tracking branch 'ReForm/master' into merge-from-ReForm, includes minor fixes (inc. VS2015 compatibility).
parents 98548526 32e3f78b
Pipeline #1544 skipped
......@@ -211,7 +211,11 @@ public:
void print(const size_t _i)
{
char buffer[128];
sprintf_s(buffer, sizeof(buffer), "%lu", _i);
#if defined(_MSC_VER) && _MSC_VER < 1900 // MSVC versions older than VC2015
sprintf_s(buffer, sizeof(buffer), "%Iu", _i);
#else // MSVC 2015 and everything else
sprintf_s(buffer, sizeof(buffer), "%zu", _i);
#endif
print(buffer);
}
......@@ -222,7 +226,6 @@ public:
print(buffer);
}
const char* double_format() const
{
if (double_format_.empty())
......
......@@ -6,6 +6,7 @@
// Define the relevant macros to throw
#ifdef DEB_ON
#include <Base/Debug/DebOut.hh>
#include <Base/Code/CodeLink.hh>
namespace Base {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment