From 8eb2c73381c2ed35767b51fde4102ec31d5ab5a1 Mon Sep 17 00:00:00 2001 From: Narr the Reg Date: Mon, 8 Aug 2022 12:49:48 -0500 Subject: core: ldn: Address review comments --- src/core/hle/service/ldn/ldn_types.h | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) (limited to 'src/core/hle/service/ldn/ldn_types.h') diff --git a/src/core/hle/service/ldn/ldn_types.h b/src/core/hle/service/ldn/ldn_types.h index 1132b2eb6..0c07a7397 100644 --- a/src/core/hle/service/ldn/ldn_types.h +++ b/src/core/hle/service/ldn/ldn_types.h @@ -1,6 +1,5 @@ -// Copyright 2022 yuzu emulator team -// Licensed under GPLv2 or any later version -// Refer to the license.txt file included. +// SPDX-FileCopyrightText: Copyright 2022 yuzu Emulator Project +// SPDX-License-Identifier: GPL-3.0-or-later #pragma once @@ -32,14 +31,6 @@ enum class NodeStateChange : u8 { DisconnectAndConnect, }; -inline NodeStateChange operator|(NodeStateChange a, NodeStateChange b) { - return static_cast(static_cast(a) | static_cast(b)); -} - -inline NodeStateChange operator|=(NodeStateChange& a, NodeStateChange b) { - return a = a | b; -} - enum class ScanFilterFlag : u32 { None = 0, LocalCommunicationId = 1 << 0, @@ -135,10 +126,7 @@ struct SessionId { u64 high; u64 low; -public: - bool operator==(const SessionId& b) const { - return (low == b.low) && (high == b.high); - } + bool operator==(const SessionId&) const = default; }; static_assert(sizeof(SessionId) == 0x10, "SessionId is an invalid size"); @@ -160,7 +148,6 @@ struct Ssid { u8 length; std::array raw; -public: std::string GetStringValue() const { return std::string(raw.data(), length); } @@ -173,7 +160,6 @@ struct Ipv4Address { std::array bytes; }; -public: std::string GetStringValue() const { return fmt::format("{}.{}.{}.{}", bytes[3], bytes[2], bytes[1], bytes[0]); } -- cgit v1.2.3