diff --git a/.github/workflows/gcc.yml b/.github/workflows/gcc11.yml similarity index 100% rename from .github/workflows/gcc.yml rename to .github/workflows/gcc11.yml diff --git a/.github/workflows/gcc14.yml b/.github/workflows/gcc14.yml deleted file mode 100644 index dc99f6b57bb..00000000000 --- a/.github/workflows/gcc14.yml +++ /dev/null @@ -1,61 +0,0 @@ -name: G++14 - -on: - push: - branches: [ main, trunk, movement ] - - pull_request: - -jobs: - build: - runs-on: ubuntu-22.04 - - steps: - - uses: actions/checkout@v2 - - - - name: Dependencies - run: | - # G++ - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test - - # MySQL - sudo rm -rf /var/lib/dpkg/lock - sudo wget https://dev.mysql.com/get/mysql-apt-config_0.8.29-1_all.deb - sudo dpkg -i mysql-apt-config_0.8.29-1_all.deb - - #OpenSSL - #sudo wget http://security.ubuntu.com/ubuntu/pool/main/o/openssl/libssl1.1_1.1.1f-1ubuntu2_amd64.deb - #sudo dpkg -i libssl1.1_1.1.1f-1ubuntu2_amd64.deb - - #sudo wget http://security.ubuntu.com/ubuntu/pool/main/o/openssl/libssl-dev_1.1.1f-1ubuntu2_amd64.deb - #sudo dpkg -i libssl-dev_1.1.1f-1ubuntu2_amd64.deb - - sudo apt update - sudo apt-get update - - sudo apt-get install openssl libssl-dev - - sudo apt install gcc-14 g++-14 - export CXX=g++-14 CC=gcc-14 - - sudo apt-get install libncurses5-dev libace-dev - sudo apt-get install build-essential autoconf libtool make cmake git-core patch wget links zip unzip unrar - sudo apt-get install libmysqlclient-dev libmysql++-dev libreadline6-dev zlib1g-dev libbz2-dev - - - - name: Setup - env: - CC: gcc-14 - CXX: g++-14 - run: | - mkdir build - cd build - cmake ../ -DSCRIPTS=1 -DTOOLS=0 -DCMAKE_BUILD_TYPE=Release - make -j4 - - #- name: Check executables - # run: | - # cd bin/check_install/bin - # ./authserver --version - # ./worldserver --version diff --git a/README.md b/README.md index a90f05da3d2..8916070840f 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,8 @@ ## Build Status [![windows-build](https://github.com/ProjectSkyfire/SkyFire_548/actions/workflows/windows.yml/badge.svg)](https://github.com/ProjectSkyfire/SkyFire_548/actions/workflows/windows.yml) -[![GCC](https://github.com/ProjectSkyfire/SkyFire_548/actions/workflows/gcc.yml/badge.svg)](https://github.com/ProjectSkyfire/SkyFire_548/actions/workflows/gcc.yml) +[![GCC11](https://github.com/ProjectSkyfire/SkyFire_548/actions/workflows/gcc11.yml/badge.svg)](https://github.com/ProjectSkyfire/SkyFire_548/actions/workflows/gcc11.yml) +[![GCC13](https://github.com/ProjectSkyfire/SkyFire_548/actions/workflows/gcc13.yml/badge.svg)](https://github.com/ProjectSkyfire/SkyFire_548/actions/workflows/gcc13.yml) # [![CodeFactor](https://www.codefactor.io/repository/github/projectskyfire/skyfire_548/badge)](https://www.codefactor.io/repository/github/projectskyfire/skyfire_548) # [![Codacy Badge](https://app.codacy.com/project/badge/Grade/57a11392c3ed42dcae439669e893565f)](https://app.codacy.com/gh/ProjectSkyfire/SkyFire_548/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade) diff --git a/src/server/shared/Dynamic/UnaryFunction.h b/src/server/shared/Dynamic/UnaryFunction.h index f1e3303e751..0c87574ba47 100644 --- a/src/server/shared/Dynamic/UnaryFunction.h +++ b/src/server/shared/Dynamic/UnaryFunction.h @@ -6,7 +6,6 @@ #ifndef SKYFIRE_UNARY_FUNCTION_H #define SKYFIRE_UNARY_FUNCTION_H -#if COMPILER == COMPILER_MICROSOFT && _MSC_VER >= 1910 && _HAS_CXX17 template struct unary_function { @@ -15,7 +14,5 @@ struct unary_function }; #define SF_UNARY_FUNCTION unary_function -#else -#define SF_UNARY_FUNCTION std::unary_function + #endif -#endif \ No newline at end of file