[2831] simplified code a bit using static_cast instead of memcpy

diff --git a/src/lib/util/tests/memory_segment_common_unittest.cc b/src/lib/util/tests/memory_segment_common_unittest.cc
index 82286c839e50436897c4a3a23ca8b639ed7533db..d47a3e25ac16f11314f72bf05aa6a119e1b10c44 100644 (file)
--- a/src/lib/util/tests/memory_segment_common_unittest.cc
+++ b/src/lib/util/tests/memory_segment_common_unittest.cc
@@ -37,7 +37,7 @@ checkSegmentNamedAddress(MemorySegment& segment, bool out_of_segment_ok) {
     // Now set it
     void* ptr32 = segment.allocate(sizeof(uint32_t));
     const uint32_t test_val = 42;
-    std::memcpy(ptr32, &test_val, sizeof(test_val));
+    *static_cast<uint32_t*>(ptr32) = test_val;
     EXPECT_FALSE(segment.setNamedAddress("test address", ptr32));
 
     // NULL name isn't allowed.
@@ -50,7 +50,7 @@ checkSegmentNamedAddress(MemorySegment& segment, bool out_of_segment_ok) {
     // Override it.
     void* ptr16 = segment.allocate(sizeof(uint16_t));
     const uint16_t test_val16 = 4200;
-    std::memcpy(ptr16, &test_val16, sizeof(test_val16));
+    *static_cast<uint16_t*>(ptr16) = test_val16;
     EXPECT_FALSE(segment.setNamedAddress("test address", ptr16));
     EXPECT_EQ(ptr16, segment.getNamedAddress("test address"));
     EXPECT_EQ(test_val16, *static_cast<const uint16_t*>(ptr16));

diff --git a/src/lib/util/tests/memory_segment_mapped_unittest.cc b/src/lib/util/tests/memory_segment_mapped_unittest.cc
index a01dc7a49bfdadaf3634dc721353404064a409e5..207c12da89e1e9892f055b0d48e290c07da30d3e 100644 (file)
--- a/src/lib/util/tests/memory_segment_mapped_unittest.cc
+++ b/src/lib/util/tests/memory_segment_mapped_unittest.cc
@@ -258,7 +258,7 @@ TEST_F(MemorySegmentMappedTest, namedAddress) {
     // Set it again and read it in the read-only mode.
     void* ptr16 = segment_->allocate(sizeof(uint16_t));
     const uint16_t test_val16 = 42000;
-    std::memcpy(ptr16, &test_val16, sizeof(test_val16));
+    *static_cast<uint16_t*>(ptr16) = test_val16;
     EXPECT_FALSE(segment_->setNamedAddress("test address", ptr16));
     MemorySegmentMapped segment_ro(mapped_file);
     EXPECT_NE(static_cast<void*>(NULL),