diff --git a/Source/Engine/Networking/NetworkReplicator.cpp b/Source/Engine/Networking/NetworkReplicator.cpp index 46bd8a4ca..a63453e8a 100644 --- a/Source/Engine/Networking/NetworkReplicator.cpp +++ b/Source/Engine/Networking/NetworkReplicator.cpp @@ -166,7 +166,7 @@ void NetworkReplicator::AddSerializer(const ScriptingTypeHandle& typeHandle, con return; // This assumes that C# glue code passed static method pointer (via Marshal.GetFunctionPointerForDelegate) - const Serializer serializer{ INetworkSerializable_Managed, INetworkSerializable_Managed, *(SerializeFunc*)(void*)&serialize, *(SerializeFunc*)(void*)&deserialize }; + const Serializer serializer{ { INetworkSerializable_Managed, INetworkSerializable_Managed }, { *(SerializeFunc*)&serialize, *(SerializeFunc*)&deserialize } }; SerializersTable.Add(typeHandle, serializer); } @@ -174,7 +174,7 @@ void NetworkReplicator::AddSerializer(const ScriptingTypeHandle& typeHandle, con void NetworkReplicator::AddSerializer(const ScriptingTypeHandle& typeHandle, SerializeFunc serialize, SerializeFunc deserialize, void* serializeTag, void* deserializeTag) { - const Serializer serializer{ serialize, deserialize, serializeTag, deserializeTag }; + const Serializer serializer{ { serialize, deserialize }, { serializeTag, deserializeTag } }; SerializersTable.Add(typeHandle, serializer); } diff --git a/Source/Engine/Serialization/WriteStream.h b/Source/Engine/Serialization/WriteStream.h index 46eb6beb1..d32d1f8ab 100644 --- a/Source/Engine/Serialization/WriteStream.h +++ b/Source/Engine/Serialization/WriteStream.h @@ -173,7 +173,7 @@ public: { uint32 id[4] = { 0 }; if (data) - Platform::MemoryCopy(id, &data->GetID(), sizeof(id)); + memcpy(id, &data->GetID(), sizeof(id)); WriteBytes(id, sizeof(id)); }