citra-emu
/
citra-canary
Archived
1
0
Fork 0

fix include/namespace related compilation errors (#7019)

a user on discord reported compilation errors when trying to compile
on Linux with GCC 13 and Clang 16.
This commit is contained in:
Vitor K 2023-09-28 10:06:50 -03:00 committed by GitHub
parent 6cfb8e02a8
commit a35f8cbb78
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 9 additions and 1 deletions

View File

@ -10,8 +10,10 @@
#include <type_traits> #include <type_traits>
#include <vector> #include <vector>
#include <SoundTouch.h> #include <SoundTouch.h>
#include "audio_core/audio_types.h" #include "audio_core/audio_types.h"
#include "audio_core/time_stretch.h" #include "audio_core/time_stretch.h"
#include "common/assert.h"
#include "common/logging/log.h" #include "common/logging/log.h"
namespace AudioCore { namespace AudioCore {

View File

@ -3,6 +3,8 @@
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <catch2/catch_test_macros.hpp> #include <catch2/catch_test_macros.hpp>
#include <fmt/format.h>
#include "audio_core/hle/adts.h" #include "audio_core/hle/adts.h"
namespace { namespace {

View File

@ -3,6 +3,8 @@
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <catch2/catch_test_macros.hpp> #include <catch2/catch_test_macros.hpp>
#include <fmt/core.h>
#include "audio_core/hle/decoder.h" #include "audio_core/hle/decoder.h"
#include "audio_core/hle/hle.h" #include "audio_core/hle/hle.h"
#include "audio_core/lle/lle.h" #include "audio_core/lle/lle.h"

View File

@ -3,6 +3,8 @@
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <catch2/catch_test_macros.hpp> #include <catch2/catch_test_macros.hpp>
#include <fmt/core.h>
#include "audio_core/hle/decoder.h" #include "audio_core/hle/decoder.h"
#include "audio_core/lle/lle.h" #include "audio_core/lle/lle.h"
#include "common/common_paths.h" #include "common/common_paths.h"

View File

@ -344,7 +344,7 @@ void OpenGLState::Apply() const {
// Clip distance // Clip distance
if (!GLES || GLAD_GL_EXT_clip_cull_distance) { if (!GLES || GLAD_GL_EXT_clip_cull_distance) {
for (size_t i = 0; i < clip_distance.size(); ++i) { for (std::size_t i = 0; i < clip_distance.size(); ++i) {
if (clip_distance[i] != cur_state.clip_distance[i]) { if (clip_distance[i] != cur_state.clip_distance[i]) {
if (clip_distance[i]) { if (clip_distance[i]) {
glEnable(GL_CLIP_DISTANCE0 + static_cast<GLenum>(i)); glEnable(GL_CLIP_DISTANCE0 + static_cast<GLenum>(i));