From b24330686654f1bd18678672543a3f389c06ec92 Mon Sep 17 00:00:00 2001 From: Jason Watkins Date: Thu, 30 Apr 2015 11:03:42 -0700 Subject: [PATCH] Added namespace qualifiers for memcpy in Message logging. --- xpcPlugin/Message.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xpcPlugin/Message.cpp b/xpcPlugin/Message.cpp index 312231c..4448dec 100644 --- a/xpcPlugin/Message.cpp +++ b/xpcPlugin/Message.cpp @@ -108,7 +108,7 @@ namespace XPC for (int i = 0; i < numCols; ++i) { values[i][0] = buffer[5 + 36 * i]; - memcpy(values[i] + 1, buffer + 9 + 36 * i, 9 * sizeof(float)); + std::memcpy(values[i] + 1, buffer + 9 + 36 * i, 9 * sizeof(float)); } ss << " (" << numCols << " lines)"; Log::WriteLine(ss.str()); @@ -157,8 +157,8 @@ namespace XPC float gear = *((float*)(buffer + 30)); float pos[3]; float orient[3]; - memcpy(pos, buffer + 6, 12); - memcpy(orient, buffer + 18, 12); + std::memcpy(pos, buffer + 6, 12); + std::memcpy(orient, buffer + 18, 12); ss << " AC:" << (int)aircraft; ss << " Pos:(" << pos[0] << ' ' << pos[1] << ' ' << pos[2] << ") Orient:("; ss << orient[3] << ' ' << orient[4] << ' ' << orient[5] << ") Gear:";