Skip to content

Fixes C4456: declaration of 'mode' hides previous local declaration #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
qjgn merged 1 commit into from
Feb 21, 2025
Merged

Fixes C4456: declaration of 'mode' hides previous local declaration #121

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions SettingsDeserializer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -770,38 +770,38 @@ bool SettingsDeserializer::DeserializeGeneralSettings(SSettingsGeneral& generalS
{
if (port < 2)
{
std::string mode;
if (!syncOutElem.TryReadElementString("Mode", mode))
std::string syncOutMode;
if (!syncOutElem.TryReadElementString("Mode", syncOutMode))
{
return false;
}

mode = ToLowerXmlString(mode);
if (mode == "shutter out")
syncOutMode = ToLowerXmlString(syncOutMode);
if (syncOutMode == "shutter out")
{
cameraSettings.eSyncOutMode[port] = ModeShutterOut;
}
else if (mode == "multiplier")
else if (syncOutMode == "multiplier")
{
cameraSettings.eSyncOutMode[port] = ModeMultiplier;
}
else if (mode == "divisor")
else if (syncOutMode == "divisor")
{
cameraSettings.eSyncOutMode[port] = ModeDivisor;
}
else if (mode == "camera independent")
else if (syncOutMode == "camera independent")
{
cameraSettings.eSyncOutMode[port] = ModeIndependentFreq;
}
else if (mode == "measurement time")
else if (syncOutMode == "measurement time")
{
cameraSettings.eSyncOutMode[port] = ModeMeasurementTime;
}
else if (mode == "continuous 100hz")
else if (syncOutMode == "continuous 100hz")
{
cameraSettings.eSyncOutMode[port] = ModeFixed100Hz;
}
else if (mode == "system live time")
else if (syncOutMode == "system live time")
{
cameraSettings.eSyncOutMode[port] = ModeSystemLiveTime;
}
Expand Down