feat(Core): Enable C++20 support (#10440)

* feat(Core): Enable C++20 support

* Update Duration.h

* Revert "Update Duration.h"

This reverts commit 177093e992c5d47d8c3b978c84857f5ecba12889.

* maybe fix GCC

* cherry-pick https://gcc.gnu.org/pipermail/gcc-cvs/2020-June/299715.html

* Update Duration.h

* Update Duration.h

* Update Duration.h

* Update Duration.h

* Update Duration.h

* Update Duration.h

* Update Duration.h

* Revert "Update Duration.h"

This reverts commit dc4e2ce281dd1a33cfac5be56488a3b96131bfd5.

* Update Duration.h

* Update Duration.h

* Update Duration.h

* cleanup

* more cleanup

* maybe fix build

* restore advstd::type_identity because GCC8 is garbage

* Update advstd.h

* fix gcc8 💤

* Update CMakeLists.txt

* Update CMakeLists.txt

* Update src/common/Utilities/advstd.h

Co-authored-by: Francesco Borzì <borzifrancesco@gmail.com>
This commit is contained in:
Kitzunu 2022-02-11 14:37:24 +01:00 committed by GitHub
parent 8a9a3c6fac
commit 7e8b021db3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 23 additions and 80 deletions

View File

@ -1,46 +0,0 @@
name: C++20
on:
push:
branches:
- 'master'
pull_request:
types: ['labeled', 'labeled', 'opened', 'synchronize', 'reopened']
concurrency:
group: ${{ github.head_ref }} || concat(${{ github.ref }}, ${{ github.workflow }})
cancel-in-progress: true
jobs:
build:
runs-on: ubuntu-20.04
name: C++20
env:
COMPILER: clang
ENABLE_CPP_20: 1
if: github.repository == 'azerothcore/azerothcore-wotlk' && (github.ref == 'refs/heads/master' || contains(github.event.pull_request.labels.*.name, 'file-cpp') || github.event.label.name == 'file-cpp' || contains(github.event.pull_request.labels.*.name, 'run-build') || github.event.label.name == 'run-build')
steps:
- uses: actions/checkout@v2
- name: Cache
uses: actions/cache@v2
with:
path: var/ccache
key: ccache:C++20:${{ github.ref }}:${{ github.sha }}
restore-keys: |
ccache:C++20:${{ github.ref }}
ccache:C++20
- name: Configure OS
run: source ./acore.sh install-deps
env:
CONTINUOUS_INTEGRATION: true
- name: Create conf/config.sh
run: source ./apps/ci/ci-conf.sh
- name: Import db
run: source ./apps/ci/ci-import-db.sh
- name: Build
run: source ./apps/ci/ci-compile.sh
- name: Dry run
run: source ./apps/ci/ci-worldserver-dry-run.sh
- name: Check startup errors
run: source ./apps/ci/ci-error-check.sh
- name: Run unit tests
run: source ./apps/ci/ci-run-unit-tests.sh

View File

@ -87,8 +87,5 @@ endif()
set(WITH_SOURCE_TREE "hierarchical" CACHE STRING "Build the source tree for IDE's.")
set_property(CACHE WITH_SOURCE_TREE PROPERTY STRINGS no flat hierarchical)
# If disable - use c++17
option(USE_CPP_20 "Enable c++20 standard" 0)
# Config abort
option(CONFIG_ABORT_INCORRECT_OPTIONS "Enable abort if core found incorrect option in config files" 0)

View File

@ -27,7 +27,7 @@ include (CheckCXXSourceCompiles)
if (WIN32)
# On windows the requirements are higher according to the wiki.
set(BOOST_REQUIRED_VERSION 1.70)
set(BOOST_REQUIRED_VERSION 1.74)
else()
set(BOOST_REQUIRED_VERSION 1.67)
endif()

View File

@ -16,15 +16,9 @@ add_library(acore-compile-option-interface INTERFACE)
# Use -std=c++11 instead of -std=gnu++11
set(CXX_EXTENSIONS OFF)
if (USE_CPP_20)
# Enable support С++20
set(CMAKE_CXX_STANDARD 20)
message(STATUS "Enabled С++20 standard")
else()
# Enable support С++17
set(CMAKE_CXX_STANDARD 17)
message(STATUS "Enabled С++17 standard")
endif()
# Enable C++20 support
set(CMAKE_CXX_STANDARD 20)
message(STATUS "Enabled С++20 standard")
# An interface library to make the warnings level available to other targets
# This interface taget is set-up through the platform specific script

View File

@ -182,12 +182,6 @@ if(BUILD_SHARED_LIBS)
WarnAboutSpacesInBuildPath()
endif()
if (USE_CPP_20)
message("")
message(" *** Enabled C++20 standart")
message(" *** Please note that this is an experimental feature!")
endif()
if (CONFIG_ABORT_INCORRECT_OPTIONS)
message("")
message(" WARNING !")

View File

@ -35,7 +35,22 @@ using Minutes = std::chrono::minutes;
/// Hours shorthand typedef.
using Hours = std::chrono::hours;
#if __cplusplus > 201703L
// Workaround for GCC and Clang 10 in C++20
#if defined(__GNUC__) && (!defined(__clang__) || (__clang_major__ == 10))
/// Days shorthand typedef.
using Days = std::chrono::duration<__INT64_TYPE__, std::ratio<86400>>;
/// Weeks shorthand typedef.
using Weeks = std::chrono::duration<__INT64_TYPE__, std::ratio<604800>>;
/// Years shorthand typedef.
using Years = std::chrono::duration<__INT64_TYPE__, std::ratio<31556952>>;
/// Months shorthand typedef.
using Months = std::chrono::duration<__INT64_TYPE__, std::ratio<2629746>>;
#else
/// Days shorthand typedef.
using Days = std::chrono::days;
@ -47,19 +62,8 @@ using Years = std::chrono::years;
/// Months shorthand typedef.
using Months = std::chrono::months;
#else
/// Days shorthand typedef. (delete after start support c++20)
using Days = std::chrono::duration<int, std::ratio_multiply<std::ratio<24>, Hours::period>>;
/// Weeks shorthand typedef. (delete after start support c++20)
using Weeks = std::chrono::duration<int, std::ratio_multiply<std::ratio<7>, Days::period>>;
/// Years shorthand typedef. (delete after start support c++20)
using Years = std::chrono::duration<int, std::ratio_multiply<std::ratio<146097, 400>, Days::period>>;
/// Months shorthand typedef. (delete after start support c++20)
using Months = std::chrono::duration<int, std::ratio_divide<Years::period, std::ratio<12>>>;
#endif
#endif // GCC_VERSION
/// time_point shorthand typedefs
using TimePoint = std::chrono::steady_clock::time_point;

View File

@ -21,7 +21,6 @@
#include "Define.h"
#include "Duration.h"
#include "Random.h"
#include "advstd.h"
#include <map>
#include <type_traits>

View File

@ -24,6 +24,8 @@
// this namespace holds implementations of upcoming stdlib features that our c++ version doesn't have yet
namespace advstd
{
// This workaround for std::remove_cvref_t, std::type_identify is needed for GCC 8...
// TODO: remove when we drop GCC 8 support. https://en.cppreference.com/w/cpp/compiler_support/20
// C++20 advstd::remove_cvref_t
template <class T>
using remove_cvref_t = std::remove_cv_t<std::remove_reference_t<T>>;

View File

@ -24,7 +24,6 @@
#include "SharedDefines.h"
#include "SpellInfo.h"
#include "SpellMgr.h"
#include "advstd.h"
using namespace Acore::Hyperlinks;