Removing Utils::Swap and using std::swap instead (#932)

This commit is contained in:
Scott Freeman 2020-01-14 18:22:50 -05:00 committed by Matt Cooley
parent ca0b3d83e8
commit 52de42e7fb
3 changed files with 2 additions and 18 deletions

View File

@ -372,14 +372,6 @@ namespace Utils
ref new Windows::UI::Xaml::PropertyChangedCallback(callback)));
}
template <typename T>
void Swap(T *ref1, T *ref2)
{
T temp = *ref1;
*ref1 = *ref2;
*ref2 = temp;
}
void IFTPlatformException(HRESULT hr);
Platform::String ^ GetStringValue(Platform::String ^ input);
bool IsLastCharacterTarget(std::wstring const& input, wchar_t target);

View File

@ -264,9 +264,9 @@ void UnitConverterViewModel::OnSwitchActive(Platform::Object ^ unused)
}
m_valueFromUnlocalized.swap(m_valueToUnlocalized);
Utils::Swap(&m_localizedValueFromFormat, &m_localizedValueToFormat);
swap(m_localizedValueFromFormat, m_localizedValueToFormat);
Utils::Swap(&m_Unit1AutomationName, &m_Unit2AutomationName);
swap(m_Unit1AutomationName, m_Unit2AutomationName);
RaisePropertyChanged(Unit1AutomationNamePropertyName);
RaisePropertyChanged(Unit2AutomationNamePropertyName);

View File

@ -349,14 +349,6 @@ namespace Utils
defaultValue,
ref new Windows::UI::Xaml::PropertyChangedCallback(callback)));
}
template <typename T>
void Swap(T *ref1, T *ref2)
{
T temp = *ref1;
*ref1 = *ref2;
*ref2 = temp;
}
}
// This goes into the header to define the property, in the public: section of the class