Index: src/libchcore/Tests/TestsTSharedMemory.cpp =================================================================== diff -u -N -r776c47d61a5a67d5e2541d58013e221c685460ec -r16c91e1039e6e64701b2daad3f9fd44ad89707e8 --- src/libchcore/Tests/TestsTSharedMemory.cpp (.../TestsTSharedMemory.cpp) (revision 776c47d61a5a67d5e2541d58013e221c685460ec) +++ src/libchcore/Tests/TestsTSharedMemory.cpp (.../TestsTSharedMemory.cpp) (revision 16c91e1039e6e64701b2daad3f9fd44ad89707e8) @@ -13,8 +13,8 @@ TSharedMemory memory; EXPECT_EQ(nullptr, memory.GetData()); EXPECT_EQ(nullptr, memory.GetFullData()); - EXPECT_EQ(0, memory.GetDataSize()); - EXPECT_EQ(0, memory.GetSharedMemorySize()); + EXPECT_EQ(0UL, memory.GetDataSize()); + EXPECT_EQ(0UL, memory.GetSharedMemorySize()); } TEST(TestsTSharedMemory, Create_ZeroSize) @@ -29,11 +29,11 @@ memory.Create(L"UnitTestsSharedMemoryName", 320); EXPECT_TRUE(memory.GetData() != nullptr); - EXPECT_EQ(0, *(unsigned int*)memory.GetData()); + EXPECT_EQ(0UL, *(unsigned int*)memory.GetData()); EXPECT_TRUE(memory.GetFullData() != nullptr); - EXPECT_EQ(4, *(unsigned int*)memory.GetFullData()); - EXPECT_EQ(4, memory.GetDataSize()); - EXPECT_EQ(324, memory.GetSharedMemorySize()); + EXPECT_EQ(4UL, *(unsigned int*)memory.GetFullData()); + EXPECT_EQ(4UL, memory.GetDataSize()); + EXPECT_EQ(324UL, memory.GetSharedMemorySize()); } TEST(TestsTSharedMemory, Create_FromEmptyString) @@ -42,11 +42,11 @@ TSharedMemory memory; memory.Create(L"UnitTestsSharedMemoryName", strData); EXPECT_TRUE(memory.GetData() != nullptr); - EXPECT_EQ(0, *(unsigned int*)memory.GetData()); + EXPECT_EQ(0UL, *(unsigned int*)memory.GetData()); EXPECT_TRUE(memory.GetFullData() != nullptr); - EXPECT_EQ(2, *(unsigned int*)memory.GetFullData()); - EXPECT_EQ(2, memory.GetDataSize()); - EXPECT_EQ(6, memory.GetSharedMemorySize()); + EXPECT_EQ(2UL, *(unsigned int*)memory.GetFullData()); + EXPECT_EQ(2UL, memory.GetDataSize()); + EXPECT_EQ(6UL, memory.GetSharedMemorySize()); } TEST(TestsTSharedMemory, Create_FromFullString) @@ -58,8 +58,8 @@ EXPECT_EQ(L'S', *memory.GetData()); EXPECT_TRUE(memory.GetFullData() != nullptr); EXPECT_EQ(22, *memory.GetFullData()); - EXPECT_EQ(22, memory.GetDataSize()); - EXPECT_EQ(26, memory.GetSharedMemorySize()); + EXPECT_EQ(22UL, memory.GetDataSize()); + EXPECT_EQ(26UL, memory.GetSharedMemorySize()); } TEST(TestsTSharedMemory, Create_FromBufferZeroSize) @@ -87,11 +87,11 @@ TSharedMemory memory; memory.Create(L"UnitTestsSharedMemoryName", (BYTE*)pszData, 1); EXPECT_TRUE(memory.GetData() != nullptr); - EXPECT_EQ(0, *(unsigned int*)memory.GetData()); + EXPECT_EQ(0UL, *(unsigned int*)memory.GetData()); EXPECT_TRUE(memory.GetFullData() != nullptr); - EXPECT_EQ(1, *(unsigned int*)memory.GetFullData()); - EXPECT_EQ(1, memory.GetDataSize()); - EXPECT_EQ(5, memory.GetSharedMemorySize()); + EXPECT_EQ(1UL, *(unsigned int*)memory.GetFullData()); + EXPECT_EQ(1UL, memory.GetDataSize()); + EXPECT_EQ(5UL, memory.GetSharedMemorySize()); } TEST(TestsTSharedMemory, Create_FromFullBuffer) @@ -103,8 +103,8 @@ EXPECT_EQ(L'S', *memory.GetData()); EXPECT_TRUE(memory.GetFullData() != nullptr); EXPECT_EQ(4, *memory.GetFullData()); - EXPECT_EQ(4, memory.GetDataSize()); - EXPECT_EQ(8, memory.GetSharedMemorySize()); + EXPECT_EQ(4UL, memory.GetDataSize()); + EXPECT_EQ(8UL, memory.GetSharedMemorySize()); } //////////////////////////////////////////////////////////////////////////////// @@ -123,8 +123,8 @@ EXPECT_EQ(L'S', *dstMemory.GetData()); EXPECT_TRUE(dstMemory.GetFullData() != nullptr); EXPECT_EQ(4, *dstMemory.GetFullData()); - EXPECT_EQ(4, dstMemory.GetDataSize()); - EXPECT_EQ(8, dstMemory.GetSharedMemorySize()); + EXPECT_EQ(4UL, dstMemory.GetDataSize()); + EXPECT_EQ(8UL, dstMemory.GetSharedMemorySize()); } TEST(TestsTSharedMemory, OpenNonExistentMemory) @@ -147,8 +147,8 @@ EXPECT_EQ(L'S', *memory.GetData()); EXPECT_TRUE(memory.GetFullData() != nullptr); EXPECT_EQ(22, *memory.GetFullData()); - EXPECT_EQ(22, memory.GetDataSize()); - EXPECT_EQ(260, memory.GetSharedMemorySize()); + EXPECT_EQ(22UL, memory.GetDataSize()); + EXPECT_EQ(260UL, memory.GetSharedMemorySize()); TString strReadData; memory.Read(strReadData); @@ -166,8 +166,8 @@ EXPECT_EQ(L'S', *memory.GetData()); EXPECT_TRUE(memory.GetFullData() != nullptr); EXPECT_EQ(22, *memory.GetFullData()); - EXPECT_EQ(22, memory.GetDataSize()); - EXPECT_EQ(260, memory.GetSharedMemorySize()); + EXPECT_EQ(22UL, memory.GetDataSize()); + EXPECT_EQ(260UL, memory.GetSharedMemorySize()); TString strReadData; memory.Read(strReadData); @@ -188,8 +188,8 @@ EXPECT_EQ(L'S', *memory.GetData()); EXPECT_TRUE(memory.GetFullData() != nullptr); EXPECT_EQ(22, *memory.GetFullData()); - EXPECT_EQ(22, memory.GetDataSize()); - EXPECT_EQ(26, memory.GetSharedMemorySize()); + EXPECT_EQ(22UL, memory.GetDataSize()); + EXPECT_EQ(26UL, memory.GetSharedMemorySize()); TString strReadData; memory.Read(strReadData); @@ -210,8 +210,8 @@ EXPECT_EQ(L'S', *memory.GetData()); EXPECT_TRUE(memory.GetFullData() != nullptr); EXPECT_EQ(22, *memory.GetFullData()); - EXPECT_EQ(22, memory.GetDataSize()); - EXPECT_EQ(26, memory.GetSharedMemorySize()); + EXPECT_EQ(22UL, memory.GetDataSize()); + EXPECT_EQ(26UL, memory.GetSharedMemorySize()); TString strReadData; memory.Read(strReadData);