From 21a5bfd55a395dac8868c9e80eab4694e3d5f497 Mon Sep 17 00:00:00 2001 From: baldurk Date: Fri, 19 Aug 2016 19:23:59 +0200 Subject: [PATCH] Fix compile warnings about shadowed variables. --- renderdoc/core/remote_server.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/renderdoc/core/remote_server.cpp b/renderdoc/core/remote_server.cpp index 34adb14f2..fb8388139 100644 --- a/renderdoc/core/remote_server.cpp +++ b/renderdoc/core/remote_server.cpp @@ -197,7 +197,7 @@ static void ActiveRemoteClientThread(void *data) if(client->IsRecvDataWaiting()) { - RemoteServerPacket type; + type = eRemoteServer_Noop; Serialiser *recvser = NULL; if(!RecvPacket(client, type, &recvser)) @@ -219,8 +219,8 @@ static void ActiveRemoteClientThread(void *data) for(auto it = drivers.begin(); it != drivers.end(); ++it) { - RDCDriver driver = it->first; - sendSer.Serialise("", driver); + RDCDriver driverType = it->first; + sendSer.Serialise("", driverType); sendSer.Serialise("", (*it).second); } } @@ -332,15 +332,15 @@ static void ActiveRemoteClientThread(void *data) } else if(RenderDoc::Inst().HasRemoteDriver(driverType)) { - ProgressLoopData data; + ProgressLoopData progressData; - data.sock = client; - data.killsignal = false; - data.progress = 0.0f; + progressData.sock = client; + progressData.killsignal = false; + progressData.progress = 0.0f; - RenderDoc::Inst().SetProgressPtr(&data.progress); + RenderDoc::Inst().SetProgressPtr(&progressData.progress); - Threading::ThreadHandle ticker = Threading::CreateThread(ProgressTicker, &data); + Threading::ThreadHandle ticker = Threading::CreateThread(ProgressTicker, &progressData); status = RenderDoc::Inst().CreateRemoteDriver(driverType, cap_file.c_str(), &driver); @@ -355,7 +355,7 @@ static void ActiveRemoteClientThread(void *data) RenderDoc::Inst().SetProgressPtr(NULL); - data.killsignal = true; + progressData.killsignal = true; Threading::JoinThread(ticker); Threading::CloseThread(ticker);