Amebis/stdex
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix to compile for Windows

Browse Source 
Signed-off-by: Simon Rozman <simon@rozman.si>
This commit is contained in:
Simon Rozman 2024-02-08 15:26:20 +01:00
parent 9acd185d44
commit b0c682edd6
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
UnitTests/parser.cpp
View File

@ -7,16 +7,16 @@
using namespace std; using namespace std;
using namespace stdex; using namespace stdex;
using namespace parser; using namespace stdex::parser;
#ifdef _WIN32 #ifdef _WIN32
using namespace Microsoft::VisualStudio::CppUnitTestFramework; using namespace Microsoft::VisualStudio::CppUnitTestFramework;
namespace Microsoft { namespace Microsoft {
namespace VisualStudio { namespace VisualStudio {
namespace CppUnitTestFramework { namespace CppUnitTestFramework {
static wstring ToString(const interval<size_t>& q) static std::wstring ToString(const stdex::interval<size_t>& q)
{ {
return sprintf(L"<%zu, %zu>", nullptr, q.start, q.end); return stdex::sprintf(L"<%zu, %zu>", nullptr, q.start, q.end);
} }
} }
} }
@ -202,7 +202,7 @@ namespace UnitTests
Assert::IsTrue(p.match(L"si56 0231 2001 5226 972", 0, SIZE_MAX, match_case_insensitive)); Assert::IsTrue(p.match(L"si56 0231 2001 5226 972", 0, SIZE_MAX, match_case_insensitive));
Assert::IsTrue(p.is_valid); Assert::IsTrue(p.is_valid);
Assert::IsTrue(p.match(L"SI56 0231 2001 5226 9720", 0, SIZE_MAX)); Assert::IsTrue(p.match(L"SI56 0231 2001 5226 9720", 0, SIZE_MAX));
Assert::AreEqual(interval<size_t>(0, 23), p.interval); Assert::AreEqual(stdex::interval<size_t>(0, 23), p.interval);
Assert::IsTrue(p.is_valid); Assert::IsTrue(p.is_valid);
Assert::IsTrue(p.match(L"...SI56 0231 2001 5226 972...", 3, SIZE_MAX)); Assert::IsTrue(p.match(L"...SI56 0231 2001 5226 972...", 3, SIZE_MAX));
Assert::IsTrue(p.is_valid); Assert::IsTrue(p.is_valid);
@ -276,11 +276,11 @@ namespace UnitTests
Assert::IsTrue(p.match(L"SI121234567890120", 0, SIZE_MAX)); Assert::IsTrue(p.match(L"SI121234567890120", 0, SIZE_MAX));
Assert::IsTrue(p.is_valid); Assert::IsTrue(p.is_valid);
Assert::AreEqual(L"12", p.model); Assert::AreEqual(L"12", p.model);
Assert::AreEqual(interval<size_t>(4, 17), p.part1.interval); Assert::AreEqual(stdex::interval<size_t>(4, 17), p.part1.interval);
Assert::IsTrue(p.match(L"SI12 1234567890120", 0, SIZE_MAX)); Assert::IsTrue(p.match(L"SI12 1234567890120", 0, SIZE_MAX));
Assert::IsTrue(p.is_valid); Assert::IsTrue(p.is_valid);
Assert::AreEqual(L"12", p.model); Assert::AreEqual(L"12", p.model);
Assert::AreEqual(interval<size_t>(5, 18), p.part1.interval); Assert::AreEqual(stdex::interval<size_t>(5, 18), p.part1.interval);
Assert::IsFalse(p.match(L"si12 1234567890120", 0, SIZE_MAX)); Assert::IsFalse(p.match(L"si12 1234567890120", 0, SIZE_MAX));
Assert::IsTrue(p.match(L"si12 1234567890120", 0, SIZE_MAX, match_case_insensitive)); Assert::IsTrue(p.match(L"si12 1234567890120", 0, SIZE_MAX, match_case_insensitive));
Assert::IsTrue(p.match(L"...SI12 1234567890120...", 3, SIZE_MAX)); Assert::IsTrue(p.match(L"...SI12 1234567890120...", 3, SIZE_MAX));
@ -354,7 +354,7 @@ namespace UnitTests
Assert::IsTrue(p.match("si56 0231 2001 5226 972", 0, SIZE_MAX, match_case_insensitive)); Assert::IsTrue(p.match("si56 0231 2001 5226 972", 0, SIZE_MAX, match_case_insensitive));
Assert::IsTrue(p.is_valid); Assert::IsTrue(p.is_valid);
Assert::IsTrue(p.match("SI56 0231 2001 5226 9720", 0, SIZE_MAX)); Assert::IsTrue(p.match("SI56 0231 2001 5226 9720", 0, SIZE_MAX));
Assert::AreEqual(interval<size_t>(0, 23), p.interval); Assert::AreEqual(stdex::interval<size_t>(0, 23), p.interval);
Assert::IsTrue(p.is_valid); Assert::IsTrue(p.is_valid);
Assert::IsTrue(p.match("...SI56 0231 2001 5226 972...", 3, SIZE_MAX)); Assert::IsTrue(p.match("...SI56 0231 2001 5226 972...", 3, SIZE_MAX));
Assert::IsTrue(p.is_valid); Assert::IsTrue(p.is_valid);
@ -391,11 +391,11 @@ namespace UnitTests
Assert::IsTrue(p.match("SI121234567890120", 0, SIZE_MAX)); Assert::IsTrue(p.match("SI121234567890120", 0, SIZE_MAX));
Assert::IsTrue(p.is_valid); Assert::IsTrue(p.is_valid);
Assert::AreEqual("12", p.model); Assert::AreEqual("12", p.model);
Assert::AreEqual(interval<size_t>(4, 17), p.part1.interval); Assert::AreEqual(stdex::interval<size_t>(4, 17), p.part1.interval);
Assert::IsTrue(p.match("SI12 1234567890120", 0, SIZE_MAX)); Assert::IsTrue(p.match("SI12 1234567890120", 0, SIZE_MAX));
Assert::IsTrue(p.is_valid); Assert::IsTrue(p.is_valid);
Assert::AreEqual("12", p.model); Assert::AreEqual("12", p.model);
Assert::AreEqual(interval<size_t>(5, 18), p.part1.interval); Assert::AreEqual(stdex::interval<size_t>(5, 18), p.part1.interval);
Assert::IsFalse(p.match("si12 1234567890120", 0, SIZE_MAX)); Assert::IsFalse(p.match("si12 1234567890120", 0, SIZE_MAX));
Assert::IsTrue(p.match("si12 1234567890120", 0, SIZE_MAX, match_case_insensitive)); Assert::IsTrue(p.match("si12 1234567890120", 0, SIZE_MAX, match_case_insensitive));
Assert::IsTrue(p.match("...SI12 1234567890120...", 3, SIZE_MAX)); Assert::IsTrue(p.match("...SI12 1234567890120...", 3, SIZE_MAX));

2
include/stdex/sys_info.hpp
View File

@ -130,7 +130,7 @@ namespace stdex
#ifndef _WIN64 #ifndef _WIN64
BOOL Wow64Process; BOOL Wow64Process;
#endif #endif
if (IsWow64Process2 && IsWow64Process2(process, &process_machine, &os_platform)) { if (IsWow64Process2 && IsWow64Process2(process, &process_machine, reinterpret_cast<USHORT*>(&os_platform))) {
wow64 = process_machine != IMAGE_FILE_MACHINE_UNKNOWN; wow64 = process_machine != IMAGE_FILE_MACHINE_UNKNOWN;
} }
#ifdef _WIN64 #ifdef _WIN64