Port "externals: Update catch to 2.3.0" from yuzu (#4060)

* externals: Update catch to 2.3.0

Updates the library from 2.2.3 to 2.3.0

* fix catch2/catch.hpp includes
This commit is contained in:
zhaowenlan1779 2018-08-25 01:45:57 +08:00 committed by Tobias
parent 642f0bd62b
commit 3b37818e5e
11 changed files with 11 additions and 11 deletions

2
externals/catch vendored

@ -1 +1 @@
Subproject commit d2d8455b571b6c66c4b7003500a77f9a93ecdc28 Subproject commit 15cf3caaceb21172ea42a24e595a2eb58c3ec960

View File

@ -3,7 +3,7 @@
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <cmath> #include <cmath>
#include <catch.hpp> #include <catch2/catch.hpp>
#include "common/param_package.h" #include "common/param_package.h"
namespace Common { namespace Common {

View File

@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <catch.hpp> #include <catch2/catch.hpp>
#include "core/arm/dyncom/arm_dyncom.h" #include "core/arm/dyncom/arm_dyncom.h"
#include "core/core_timing.h" #include "core/core_timing.h"

View File

@ -2,7 +2,7 @@
// Licensed under GPLv2+ // Licensed under GPLv2+
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <catch.hpp> #include <catch2/catch.hpp>
#include <array> #include <array>
#include <bitset> #include <bitset>

View File

@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <catch.hpp> #include <catch2/catch.hpp>
#include "common/file_util.h" #include "common/file_util.h"
#include "core/file_sys/path_parser.h" #include "core/file_sys/path_parser.h"

View File

@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <catch.hpp> #include <catch2/catch.hpp>
#include "core/hle/ipc.h" #include "core/hle/ipc.h"
#include "core/hle/kernel/client_port.h" #include "core/hle/kernel/client_port.h"
#include "core/hle/kernel/client_session.h" #include "core/hle/kernel/client_session.h"

View File

@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <catch.hpp> #include <catch2/catch.hpp>
#include "core/hle/kernel/memory.h" #include "core/hle/kernel/memory.h"
#include "core/hle/kernel/process.h" #include "core/hle/kernel/process.h"
#include "core/memory.h" #include "core/memory.h"

View File

@ -3,7 +3,7 @@
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <vector> #include <vector>
#include <catch.hpp> #include <catch2/catch.hpp>
#include "core/hle/kernel/errors.h" #include "core/hle/kernel/errors.h"
#include "core/hle/kernel/memory.h" #include "core/hle/kernel/memory.h"
#include "core/hle/kernel/vm_manager.h" #include "core/hle/kernel/vm_manager.h"

View File

@ -2,7 +2,7 @@
// Licensed under GPLv2 or any later version // Licensed under GPLv2 or any later version
// Refer to the license.txt file included. // Refer to the license.txt file included.
#include <catch.hpp> #include <catch2/catch.hpp>
#include <glad/glad.h> #include <glad/glad.h>
// This is not an actual test, but a work-around for issue #2183. // This is not an actual test, but a work-around for issue #2183.

View File

@ -3,7 +3,7 @@
// Refer to the license.txt file included. // Refer to the license.txt file included.
#define CATCH_CONFIG_MAIN #define CATCH_CONFIG_MAIN
#include <catch.hpp> #include <catch2/catch.hpp>
// Catch provides the main function since we've given it the // Catch provides the main function since we've given it the
// CATCH_CONFIG_MAIN preprocessor directive. // CATCH_CONFIG_MAIN preprocessor directive.

View File

@ -5,7 +5,7 @@
#include <algorithm> #include <algorithm>
#include <cmath> #include <cmath>
#include <memory> #include <memory>
#include <catch.hpp> #include <catch2/catch.hpp>
#include <nihstro/inline_assembly.h> #include <nihstro/inline_assembly.h>
#include "video_core/shader/shader_jit_x64_compiler.h" #include "video_core/shader/shader_jit_x64_compiler.h"