mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-02-20 06:40:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

[CMake] Use C++17

Browse Source
This commit is contained in:
Nekotekina 2018-08-24 00:32:40 +03:00
parent 76bac80dde
commit 5afd12e8a4
3 changed files with 3 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rpcs3/CMakeLists.txt
View File

@ -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

9
rpcs3/Emu/RSX/rsx_utils.h
View File

@ -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"
{ {

10
rpcs3/stdafx.h
View File

@ -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;
}
}