diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2018-08-09 15:20:52 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2018-08-09 15:20:52 -0300 |
| commit | d538da7a054f11d7e41153b9341c53755f942079 (patch) | |
| tree | 3b7b8c28289542ca78a96a3e3afba997300219f1 /windows | |
| parent | dc34d720b38ea8bcd247253b5354cb8480dd686a (diff) | |
| parent | 14f77919e05e964b960a241eb5a9108c51aa46bb (diff) | |
| download | mullvadvpn-d538da7a054f11d7e41153b9341c53755f942079.tar.xz mullvadvpn-d538da7a054f11d7e41153b9341c53755f942079.zip | |
Merge branch 'fix-error-encoding'
Diffstat (limited to 'windows')
| -rw-r--r-- | windows/winroute/src/winroute/InterfacePair.cpp | 6 | ||||
| -rw-r--r-- | windows/winroute/src/winroute/NetworkInterfaces.cpp | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/windows/winroute/src/winroute/InterfacePair.cpp b/windows/winroute/src/winroute/InterfacePair.cpp index eda7dd8314..074a80efbd 100644 --- a/windows/winroute/src/winroute/InterfacePair.cpp +++ b/windows/winroute/src/winroute/InterfacePair.cpp @@ -20,7 +20,7 @@ InterfacePair::InterfacePair(NET_LUID interface_luid) if (!(HasIPv4() || HasIPv6())) { std::stringstream ss; - ss << L"LUID " + ss << "LUID " << interface_luid.Value << " does not specify any IPv4 or IPv6 interfaces"; throw std::runtime_error(ss.str()); @@ -56,7 +56,7 @@ void InterfacePair::SetInterface(PMIB_IPINTERFACE_ROW iface) { if (status != NO_ERROR) { std::stringstream ss; - ss << L"Failed to set metric for " + ss << "Failed to set metric for " << (iface->Family == AF_INET ? "IPv4" : "IPv6") << " interface with LUID" << iface->InterfaceLuid.Value @@ -86,7 +86,7 @@ void InterfacePair::InitializeInterface(PMIB_IPINTERFACE_ROW iface) } else { std::stringstream ss; - ss << L"Failed get network interface with LUID " + ss << "Failed to get network interface with LUID " << &iface->InterfaceLuid.Value << ": " << status; diff --git a/windows/winroute/src/winroute/NetworkInterfaces.cpp b/windows/winroute/src/winroute/NetworkInterfaces.cpp index f80c2f5f3b..a0a4d53db8 100644 --- a/windows/winroute/src/winroute/NetworkInterfaces.cpp +++ b/windows/winroute/src/winroute/NetworkInterfaces.cpp @@ -48,7 +48,7 @@ void NetworkInterfaces::EnsureIfaceMetricIsHighest(NET_LUID interfaceLuid) if (success != NO_ERROR) { std::stringstream ss; - ss << L"Failed to increment metric for interface with LUID " + ss << "Failed to increment metric for interface with LUID " << &iface->InterfaceLuid.Value << ": " << success; @@ -67,7 +67,7 @@ NetworkInterfaces::NetworkInterfaces() if (success != NO_ERROR) { std::stringstream ss; - ss << L"Failed to enumerate network interfaces: " << success; + ss << "Failed to enumerate network interfaces: " << success; throw std::runtime_error(ss.str()); } } |