From d5923ef808b16500efe681eb01f20e920f1421c6 Mon Sep 17 00:00:00 2001
From: Megamouse <studienricky89@googlemail.com>
Date: Thu, 27 Jun 2024 20:37:33 +0200
Subject: [PATCH] Fix weird new gcc namespace warning

---
 rpcs3/Input/ds3_pad_handler.cpp        | 2 ++
 rpcs3/Input/ds3_pad_handler.h          | 4 ++--
 rpcs3/Input/ds4_pad_handler.cpp        | 2 ++
 rpcs3/Input/ds4_pad_handler.h          | 6 +++---
 rpcs3/Input/dualsense_pad_handler.cpp  | 2 ++
 rpcs3/Input/dualsense_pad_handler.h    | 4 ++--
 rpcs3/Input/skateboard_pad_handler.cpp | 2 ++
 rpcs3/Input/skateboard_pad_handler.h   | 4 ++--
 8 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/rpcs3/Input/ds3_pad_handler.cpp b/rpcs3/Input/ds3_pad_handler.cpp
index b78d7bcbfa..7ce3660974 100644
--- a/rpcs3/Input/ds3_pad_handler.cpp
+++ b/rpcs3/Input/ds3_pad_handler.cpp
@@ -6,6 +6,8 @@
 
 LOG_CHANNEL(ds3_log, "DS3");
 
+using namespace reports;
+
 constexpr std::array<u8, 6> battery_capacity = {0, 1, 25, 50, 75, 100};
 
 constexpr id_pair SONY_DS3_ID_0 = {0x054C, 0x0268};
diff --git a/rpcs3/Input/ds3_pad_handler.h b/rpcs3/Input/ds3_pad_handler.h
index b8dae2dae3..b6b423eff3 100644
--- a/rpcs3/Input/ds3_pad_handler.h
+++ b/rpcs3/Input/ds3_pad_handler.h
@@ -4,7 +4,7 @@
 
 #include <unordered_map>
 
-namespace
+namespace reports
 {
 	struct ds3_rumble
 	{
@@ -67,7 +67,7 @@ public:
 #ifdef _WIN32
 	u8 report_id = 0;
 #endif
-	ds3_input_report report{};
+	reports::ds3_input_report report{};
 };
 
 class ds3_pad_handler final : public hid_pad_handler<ds3_device>
diff --git a/rpcs3/Input/ds4_pad_handler.cpp b/rpcs3/Input/ds4_pad_handler.cpp
index a1ded567aa..71d69609ac 100644
--- a/rpcs3/Input/ds4_pad_handler.cpp
+++ b/rpcs3/Input/ds4_pad_handler.cpp
@@ -6,6 +6,8 @@
 
 LOG_CHANNEL(ds4_log, "DS4");
 
+using namespace reports;
+
 constexpr id_pair SONY_DS4_ID_0 = {0x054C, 0x0BA0}; // Dongle
 constexpr id_pair SONY_DS4_ID_1 = {0x054C, 0x05C4}; // CUH-ZCT1x
 constexpr id_pair SONY_DS4_ID_2 = {0x054C, 0x09CC}; // CUH-ZCT2x
diff --git a/rpcs3/Input/ds4_pad_handler.h b/rpcs3/Input/ds4_pad_handler.h
index a6873b8748..aab8b49623 100644
--- a/rpcs3/Input/ds4_pad_handler.h
+++ b/rpcs3/Input/ds4_pad_handler.h
@@ -4,7 +4,7 @@
 
 #include <unordered_map>
 
-namespace
+namespace reports
 {
 	constexpr u32 DS4_ACC_RES_PER_G = 8192;
 	constexpr u32 DS4_GYRO_RES_PER_DEG_S = 86; // technically this could be 1024, but keeping it at 86 keeps us within 16 bits of precision
@@ -119,8 +119,8 @@ public:
 	bool bt_controller{false};
 	bool has_calib_data{false};
 	std::array<CalibData, CalibIndex::COUNT> calib_data{};
-	ds4_input_report_usb report_usb{};
-	ds4_input_report_bt report_bt{};
+	reports::ds4_input_report_usb report_usb{};
+	reports::ds4_input_report_bt report_bt{};
 };
 
 class ds4_pad_handler final : public hid_pad_handler<DS4Device>
diff --git a/rpcs3/Input/dualsense_pad_handler.cpp b/rpcs3/Input/dualsense_pad_handler.cpp
index b3c3021ccd..58856f89cd 100644
--- a/rpcs3/Input/dualsense_pad_handler.cpp
+++ b/rpcs3/Input/dualsense_pad_handler.cpp
@@ -6,6 +6,8 @@
 
 LOG_CHANNEL(dualsense_log, "DualSense");
 
+using namespace reports;
+
 template <>
 void fmt_class_string<DualSenseDevice::DualSenseDataMode>::format(std::string& out, u64 arg)
 {
diff --git a/rpcs3/Input/dualsense_pad_handler.h b/rpcs3/Input/dualsense_pad_handler.h
index 32b56be4e7..8598927b63 100644
--- a/rpcs3/Input/dualsense_pad_handler.h
+++ b/rpcs3/Input/dualsense_pad_handler.h
@@ -4,7 +4,7 @@
 
 #include <unordered_map>
 
-namespace
+namespace reports
 {
 	constexpr u32 DUALSENSE_ACC_RES_PER_G = 8192;
 	constexpr u32 DUALSENSE_GYRO_RES_PER_DEG_S = 86; // technically this could be 1024, but keeping it at 86 keeps us within 16 bits of precision
@@ -172,7 +172,7 @@ public:
 	u8 bt_sequence{0};
 	bool has_calib_data{false};
 	std::array<CalibData, CalibIndex::COUNT> calib_data{};
-	dualsense_input_report_common report{}; // No need to have separate reports for usb and bluetooth
+	reports::dualsense_input_report_common report{}; // No need to have separate reports for usb and bluetooth
 	DualSenseDataMode data_mode{DualSenseDataMode::Simple};
 	DualSenseFeatureSet feature_set{DualSenseFeatureSet::Normal};
 	bool init_lightbar{true};
diff --git a/rpcs3/Input/skateboard_pad_handler.cpp b/rpcs3/Input/skateboard_pad_handler.cpp
index 36b5b21397..93b4ae423f 100644
--- a/rpcs3/Input/skateboard_pad_handler.cpp
+++ b/rpcs3/Input/skateboard_pad_handler.cpp
@@ -4,6 +4,8 @@
 
 LOG_CHANNEL(skateboard_log, "Skateboard");
 
+using namespace reports;
+
 namespace
 {
 	constexpr id_pair SKATEBOARD_ID_0 = {0x12BA, 0x0400}; // Tony Hawk RIDE Skateboard
diff --git a/rpcs3/Input/skateboard_pad_handler.h b/rpcs3/Input/skateboard_pad_handler.h
index 626fbb521f..db1e3536d8 100644
--- a/rpcs3/Input/skateboard_pad_handler.h
+++ b/rpcs3/Input/skateboard_pad_handler.h
@@ -5,7 +5,7 @@
 #include <array>
 #include <unordered_map>
 
-namespace
+namespace reports
 {
 	// Descriptor
 	// 0x09, 0x05,        // Usage (0x05)
@@ -143,7 +143,7 @@ class skateboard_device : public HidDevice
 {
 public:
 	bool skateboard_is_on = false;
-	skateboard_input_report report{};
+	reports::skateboard_input_report report{};
 };
 
 class skateboard_pad_handler final : public hid_pad_handler<skateboard_device>