diff options
| author | Odd Stranne <odd@mullvad.net> | 2018-05-31 18:27:37 +0200 |
|---|---|---|
| committer | Odd Stranne <odd@mullvad.net> | 2018-06-18 08:45:14 +0200 |
| commit | f2ed4c07f290d93315d6eca231b6ce4cf5646753 (patch) | |
| tree | 24ddf4a4adc57cd82174e5357a40cfe8c2b5230f /windows | |
| parent | 85294e45f07ec4002db8abb1c51500b07bc65ee7 (diff) | |
| download | mullvadvpn-f2ed4c07f290d93315d6eca231b6ce4cf5646753.tar.xz mullvadvpn-f2ed4c07f290d93315d6eca231b6ce4cf5646753.zip | |
Remove wrongly named function with only a single ref
Diffstat (limited to 'windows')
| -rw-r--r-- | windows/windns/src/windns/netconfighelpers.cpp | 7 | ||||
| -rw-r--r-- | windows/windns/src/windns/netconfighelpers.h | 5 |
2 files changed, 2 insertions, 10 deletions
diff --git a/windows/windns/src/windns/netconfighelpers.cpp b/windows/windns/src/windns/netconfighelpers.cpp index 701cfcce6f..a793ff2484 100644 --- a/windows/windns/src/windns/netconfighelpers.cpp +++ b/windows/windns/src/windns/netconfighelpers.cpp @@ -9,11 +9,6 @@ namespace nchelpers { -std::wstring GetConfigId(CComPtr<IWbemClassObject> instance) -{ - return ComConvertString(V_BSTR(&ComGetPropertyAlways(instance, L"SettingID"))); -} - OptionalStringList GetDnsServers(CComPtr<IWbemClassObject> instance) { OptionalStringList result; @@ -25,7 +20,7 @@ OptionalStringList GetDnsServers(CComPtr<IWbemClassObject> instance) return result; } - result = std::make_unique<std::vector<std::wstring> >( + result = std::make_shared<std::vector<std::wstring> >( ComConvertStringArray(V_ARRAY(&servers))); return result; diff --git a/windows/windns/src/windns/netconfighelpers.h b/windows/windns/src/windns/netconfighelpers.h index 6949eced7e..42602b1b9f 100644 --- a/windows/windns/src/windns/netconfighelpers.h +++ b/windows/windns/src/windns/netconfighelpers.h @@ -10,10 +10,7 @@ namespace nchelpers { -// instance = Win32_NetworkAdapterConfiguration -std::wstring GetConfigId(CComPtr<IWbemClassObject> instance); - -using OptionalStringList = std::unique_ptr<std::vector<std::wstring> >; +using OptionalStringList = std::shared_ptr<std::vector<std::wstring> >; // instance = Win32_NetworkAdapterConfiguration OptionalStringList GetDnsServers(CComPtr<IWbemClassObject> instance); |