From 8f502a94bf328da80da39cac4abe2e75b77f8a7d Mon Sep 17 00:00:00 2001
From: Jesse Talavera-Greenberg <jesse@jesse.tg>
Date: Tue, 5 Dec 2023 13:19:35 -0500
Subject: [PATCH] Clean up span polyfills

---
 src/libretro/CMakeLists.txt         |  1 -
 src/libretro/config/config.cpp      |  1 -
 src/libretro/platform/semaphore.cpp |  8 --------
 src/libretro/span.hpp               | 30 -----------------------------
 4 files changed, 40 deletions(-)
 delete mode 100644 src/libretro/span.hpp

diff --git a/src/libretro/CMakeLists.txt b/src/libretro/CMakeLists.txt
index 1032b587..636f5ec9 100644
--- a/src/libretro/CMakeLists.txt
+++ b/src/libretro/CMakeLists.txt
@@ -72,7 +72,6 @@ add_library(melondsds_libretro MODULE
     retro/threads.hpp
     screenlayout.cpp
     screenlayout.hpp
-    span.hpp
     sram.cpp
     sram.hpp
     tracy.hpp
diff --git a/src/libretro/config/config.cpp b/src/libretro/config/config.cpp
index 4ebcf59c..cccac16d 100644
--- a/src/libretro/config/config.cpp
+++ b/src/libretro/config/config.cpp
@@ -66,7 +66,6 @@
 #include "render.hpp"
 #include "retro/dirent.hpp"
 #include "screenlayout.hpp"
-#include "span.hpp"
 #include "tracy.hpp"
 #include "pcap.hpp"
 
diff --git a/src/libretro/platform/semaphore.cpp b/src/libretro/platform/semaphore.cpp
index df2dfe62..781fc3db 100644
--- a/src/libretro/platform/semaphore.cpp
+++ b/src/libretro/platform/semaphore.cpp
@@ -15,19 +15,11 @@
 */
 
 #include <Platform.h>
-#ifdef __cpp_lib_semaphore
 #include <semaphore>
-#else
-#include <semaphore.h>
-#endif
 
 #include "tracy.hpp"
 
-#ifdef __cpp_lib_semaphore
 using std::counting_semaphore;
-#else
-using cyan::counting_semaphore;
-#endif
 
 using namespace melonDS;
 using Platform::Semaphore;
diff --git a/src/libretro/span.hpp b/src/libretro/span.hpp
deleted file mode 100644
index 7ae817c4..00000000
--- a/src/libretro/span.hpp
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-    Copyright 2023 Jesse Talavera-Greenberg
-
-    melonDS DS is free software: you can redistribute it and/or modify it under
-    the terms of the GNU General Public License as published by the Free
-    Software Foundation, either version 3 of the License, or (at your option)
-    any later version.
-
-    melonDS DS is distributed in the hope that it will be useful, but WITHOUT ANY
-    WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
-    FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with melonDS DS. If not, see http://www.gnu.org/licenses/.
-*/
-
-#ifndef MELONDSDS_SPAN_HPP
-#define MELONDSDS_SPAN_HPP
-
-#ifdef __cpp_lib_span
-#include <span>
-#else
-#include <tcb/span.hpp>
-
-namespace std {
-    using tcb::span;
-}
-#endif
-
-#endif //MELONDSDS_SPAN_HPP