mirror of
https://github.com/RPCS3/rpcs3.git
synced 2025-02-17 15:40:44 +00:00
[CMake] Use C++17
This commit is contained in:
parent
76bac80dde
commit
5afd12e8a4
rpcs3
@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.1)
|
|||||||
|
|
||||||
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake_modules")
|
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake_modules")
|
||||||
set(RES_FILES "")
|
set(RES_FILES "")
|
||||||
set(CMAKE_CXX_STANDARD 14)
|
set(CMAKE_CXX_STANDARD 17)
|
||||||
include(CheckCXXCompilerFlag)
|
include(CheckCXXCompilerFlag)
|
||||||
|
|
||||||
# Qt section
|
# Qt section
|
||||||
|
@ -6,14 +6,7 @@
|
|||||||
#include <atomic>
|
#include <atomic>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <bitset>
|
#include <bitset>
|
||||||
|
#include <optional>
|
||||||
// TODO: replace the code below by #include <optional> when C++17 or newer will be used
|
|
||||||
#include <optional.hpp>
|
|
||||||
namespace std
|
|
||||||
{
|
|
||||||
template<class T>
|
|
||||||
using optional = experimental::optional<T>;
|
|
||||||
}
|
|
||||||
|
|
||||||
extern "C"
|
extern "C"
|
||||||
{
|
{
|
||||||
@ -686,7 +679,7 @@ namespace rsx
|
|||||||
return dst_index;
|
return dst_index;
|
||||||
}
|
}
|
||||||
|
|
||||||
// The rsx internally adds the 'data_base_offset' and the 'vert_offset' and masks it
|
// The rsx internally adds the 'data_base_offset' and the 'vert_offset' and masks it
|
||||||
// before actually attempting to translate to the internal address. Seen happening heavily in R&C games
|
// before actually attempting to translate to the internal address. Seen happening heavily in R&C games
|
||||||
static inline u32 get_vertex_offset_from_base(u32 vert_data_base_offset, u32 vert_base_offset)
|
static inline u32 get_vertex_offset_from_base(u32 vert_data_base_offset, u32 vert_base_offset)
|
||||||
{
|
{
|
||||||
|
@ -45,13 +45,3 @@ namespace std { inline namespace literals { inline namespace chrono_literals {}}
|
|||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
|
||||||
using namespace std::literals;
|
using namespace std::literals;
|
||||||
|
|
||||||
// Remove once we move to C++17
|
|
||||||
namespace std
|
|
||||||
{
|
|
||||||
template<typename T>
|
|
||||||
constexpr const T clamp(const T value, const T min, const T max)
|
|
||||||
{
|
|
||||||
return value < min ? min : value > max ? max : value;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user