From bd22bbb6d9a5b14e30c8ff5088d19d7a15ccda0c Mon Sep 17 00:00:00 2001 From: Valentino Orlandi Date: Sat, 17 Feb 2024 14:08:56 +0100 Subject: [PATCH] Fixes for MSVC --- logdoctor/tests/white_box.cpp | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/logdoctor/tests/white_box.cpp b/logdoctor/tests/white_box.cpp index 4146f776..0035c8fa 100644 --- a/logdoctor/tests/white_box.cpp +++ b/logdoctor/tests/white_box.cpp @@ -82,16 +82,32 @@ void testOperators() { const FieldData fd; + #ifdef _MSC_VER + assert( operator+(0ul, fd) == 0ul ); + #else assert( 0ul + fd == 0ul ); + #endif }{ const FieldData fd(""); + #ifdef _MSC_VER + assert( operator+(0ul, fd) == 0ul ); + #else assert( 0ul + fd == 0ul ); + #endif }{ const FieldData fd("1"); + #ifdef _MSC_VER + assert(operator+(0ul, fd) == 1ul ); + #else assert( 0ul + fd == 1ul ); + #endif }{ const FieldData fd("0123456789"); + #ifdef _MSC_VER + assert( operator+(10ul, fd) == 20ul ); + #else assert( 10ul + fd == 20ul ); + #endif assert( fd + 10ul != 20ul ); // fd evaluates to bool (aka 1) }{ const FieldData fd1; @@ -112,7 +128,11 @@ void testOperators() }{ const FieldData fd1("123"); const FieldData fd2("456"); + #ifdef _MSC_VER + assert( operator+(4ul, fd1) + fd2 == 10ul ); + #else assert( 4ul + fd1 + fd2 == 10ul ); + #endif }{ const FieldData fd1("0123456789"); const FieldData fd2("0123456789"); @@ -122,7 +142,11 @@ void testOperators() const FieldData fd1("0123456789"); const FieldData fd2("0123456789"); const FieldData fd3("0123456789"); + #ifdef _MSC_VER + assert( operator+(70ul, fd1) + fd2 + fd3 == 100ul ); + #else assert( 70ul + fd1 + fd2 + fd3 == 100ul ); + #endif }{ const FieldData fd1("0123456789"); const FieldData fd2("0123456789"); @@ -132,7 +156,11 @@ void testOperators() const FieldData fd1("0123456789"); const FieldData fd2("0123456789"); const FieldData fd3("0123456789"); + #ifdef _MSC_VER + assert( operator+(10ul, fd1) + fd2 + fd3 + 10ul == 50ul ); + #else assert( 10ul + fd1 + fd2 + fd3 + 10ul == 50ul ); + #endif }{ const FieldData fd1("0123456789"); const FieldData fd2("0123456789"); @@ -149,7 +177,11 @@ void testOperators() const FieldData fd3("0123456789"); const FieldData fd4("0123456789"); const FieldData fd5("0123456789"); + #ifdef _MSC_VER + assert( operator+(10ul, fd1) + 20ul + fd2 + fd3 + 10ul + fd4 + 10ul + fd5 == 100ul ); + #else assert( 10ul + fd1 + 20ul + fd2 + fd3 + 10ul + fd4 + 10ul + fd5 == 100ul ); + #endif } T_PRINT("FieldData::operator +"); }