Make Ubuntu Focal build work

daschuer · Aug 7, 2022 · 601936b · 601936b
1 parent b95604e
commit 601936b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/src/test/engineeffectsdelay_test.cpp b/src/test/engineeffectsdelay_test.cpp
@@ -11,12 +11,12 @@
 
 #include <QTest>
 #include <QtDebug>
-#include <span>
 
 #include "engine/engine.h"
 #include "test/mixxxtest.h"
 #include "util/sample.h"
 #include "util/samplebuffer.h"
+#include "util/span.h"
 #include "util/types.h"
 
 namespace {

diff --git a/src/util/samplebuffer.h b/src/util/samplebuffer.h
@@ -2,7 +2,6 @@
 
 
 #include <algorithm> // std::swap
-#include <span>
 
 #include "util/span.h"
 #include "util/types.h"

diff --git a/src/util/span.h b/src/util/span.h
@@ -1,6 +1,14 @@
 #pragma once
 
+#if __has_include(<span>)
 #include <span>
+#else
+#include <gsl/span>
+namespace std {
+using gsl::span;
+} // namespace std
+#endif
+
 #include <type_traits>
 
 #include "util/assert.h"