Move SuperTux to C++20 #1728

Grumbel · 2021-04-19T20:56:42Z

This is restoring #1602 back into a compilable state. Let's see what breaks.

Grumbel · 2021-04-20T03:10:43Z

Everything outside of UBPorts compiles with C++20 set. UBPorts is a bit problematic, as it's stuck on an ancient Ubuntu 16.04, which is EOL in a week. No idea how far away the UBPorts 20.04 update is or if there are any PPAs that could give us a newer gcc/clang on that system. UBPorts doesn't support C++17 either.

Semphriss · 2021-04-20T19:30:38Z

Consideration: Ubuntu 18.04 can no longer compile SuperTux out of the box. Neither CMake nor the default GCC, as given by the repositories, support C++20; for the compiler, Canonical provides later versions of Clang; for CMake, I couldn't find later versions that support C++20.

I have no idea how other distros are affected, as I only run Ubuntu 18.04 and 20.04.

Grumbel · 2021-04-22T11:35:18Z

I am not too worried about Ubuntu 18.04, as newer compiler are easily available from PPA and we have appimage/flatpak/guix packages on top of that.

But UBPorts will be difficult, as there doesn't seem to be an easy way to get a new compiler onto that. We might need to compile one ourselves.

jwakely · 2021-08-09T16:21:51Z

src/supertux/main.cpp


  bool success = true;

  // cycle through the directory
-  for (boost::filesystem::directory_iterator itr(olduserpath); itr != end_itr; ++itr) {
+  for (std::filesystem::directory_iterator itr(olduserpath); itr != end_itr; ++itr) {


filesystem::directory_iterator can be used directly with range-based for:

Suggested change

for (std::filesystem::directory_iterator itr(olduserpath); itr != end_itr; ++itr) {

for (const auto& file : std::filesystem::directory_iterator(olduserpath)) {

jwakely · 2021-08-09T16:24:48Z

src/supertux/main.cpp

  try
  {
-    boost::filesystem::rename(itr->path().string().c_str(), userpath / itr->path().filename());
+    std::filesystem::rename(itr->path().string().c_str(), userpath / itr->path().filename());


Why create a temporary string by calling string() and then get a const char* instead of just itr->path.c_str()?

But why get a const char* from it at all, when that just has to be converted to a new filesystem::path (which allocates more memory and parses the path again)?

Suggested change

std::filesystem::rename(itr->path().string().c_str(), userpath / itr->path().filename());

std::filesystem::rename(itr->path(), userpath / itr->path().filename());

jwakely · 2021-08-09T16:45:31Z

src/supertux/game_session.cpp

@@ -16,6 +16,8 @@

 #include "supertux/game_session.hpp"

+#include <cfloat>
+


This change is needed independent of any move to C++20, see #1804

The converter takes care of it and the string in question is plain ASCII.

/home/runner/work/supertux/supertux/src/math/rect.hpp:147:47: error: zero as null pointer constant [-Werror,-Wzero-as-null-pointer-constant] return std::tie(left, top, right, bottom) < std::tie(other.left, other.top, other.right, other.bottom); ^ nullptr /usr/bin/../lib/gcc/x86_64-linux-gnu/10/../../../../include/c++/10/tuple:1426:5: note: while rewriting comparison as call to 'operator<=>' declared here operator<=>(const tuple<_Tps...>& __t, const tuple<_Ups...>& __u)

This gets fixed in later C++ standards, not worth bothering with.

UBPorts is stuck on Ubuntu 16.04, which provides no compiler capable of C++20, so this has to wait until they catch up to at least 20.04.

Only update 64bit, leave 32bit on the default gcc, gcc-10 fails: CMake Error at /usr/local/share/cmake-3.20/Modules/CMakeTestCCompiler.cmake:66 (message): The C compiler "/usr/bin/gcc" is not able to compile a simple test program.

Removing this needs to wait for the commandergenius repository to remove boost first.

The ..._OTHER variable already contains all the actual flags, LDFLAGS/CFLAGS variables contain all the flags and include/link directories combined, which is redundant.

mrkubax10 · 2023-06-11T18:31:08Z

This is probably replaced by #2473

mrkubax10 · 2023-07-27T12:10:18Z

Since #2473 was merged a while ago and this PR has a lot of conflicts it was decided to close this PR. Personally I think that it's to early to move to C++20, maybe in 1.5 years when compilers supporting C++20 will be available on more systems.

Grumbel force-pushed the feature/c++20 branch 6 times, most recently from e9f3bfc to 61b46f6 Compare April 20, 2021 17:22

Grumbel marked this pull request as ready for review April 20, 2021 17:56

Grumbel changed the title ~~Move SuperTux to C++17 (or C++20)~~ Move SuperTux to C++20 Apr 20, 2021

Grumbel mentioned this pull request Apr 21, 2021

Replace boost::format with fmt #1730

Closed

Grumbel force-pushed the feature/c++20 branch 2 times, most recently from 4a68838 to 20c451e Compare April 22, 2021 11:12

Grumbel force-pushed the feature/c++20 branch 3 times, most recently from 17abf0d to 1587b36 Compare April 28, 2021 12:49

Grumbel force-pushed the feature/c++20 branch 4 times, most recently from f97713c to aa078ea Compare May 8, 2021 14:54

Grumbel force-pushed the feature/c++20 branch from 0ad65c7 to 3e8f752 Compare May 13, 2021 12:37

jwakely reviewed Aug 9, 2021

View reviewed changes

Grumbel force-pushed the feature/c++20 branch 2 times, most recently from 8b1fb8c to 69f582c Compare August 9, 2021 21:11

Grumbel force-pushed the feature/c++20 branch from 69f582c to cceafd8 Compare October 8, 2021 15:41

Grumbel force-pushed the feature/c++20 branch 2 times, most recently from 279548c to ca1184d Compare December 22, 2021 10:33

Grumbel added 25 commits July 24, 2022 16:15

Remove unnecessary u8 string declaration

08a8f64

The converter takes care of it and the string in question is plain ASCII.

Fix g++-10/boost-1.71 conflict on Ubuntu 20.04

72008b4

Update CMakeLists.txt to use C++20

69bd831

Add missing includes

fed2af0

Replace boost with standard C++

1514784

Fix float conversion warnings

2b4d3a6

Fix compiler warning due to pragma

7813653

Add -Wno-return-std-move-in-c++11

737ea6a

This gets fixed in later C++ standards, not worth bothering with.

Replace .string().c_str() with just .c_str()

5ac9975

Use range-based for loop for directory_iterator

9228428

Replace boost::optional with std::optional

4764bae

Remove boost dependency

2f34491

Fix missing fmt::runtime() calls

be4e69e

Disable UBPorts support in CI

89890d9

UBPorts is stuck on Ubuntu 16.04, which provides no compiler capable of C++20, so this has to wait until they catch up to at least 20.04.

Update gcc/clang on Ubuntu CI

366ddf1

Only update 64bit, leave 32bit on the default gcc, gcc-10 fails: CMake Error at /usr/local/share/cmake-3.20/Modules/CMakeTestCCompiler.cmake:66 (message): The C compiler "/usr/bin/gcc" is not able to compile a simple test program.

Add more SDL2 pkg-config results into the INTERFACE library

55dd231

Add boost back to Android

e9f45ad

Removing this needs to wait for the commandergenius repository to remove boost first.

Remove LDFLAGS/CFLAGS from ProvideSDL2.cmake

e287d42

The ..._OTHER variable already contains all the actual flags, LDFLAGS/CFLAGS variables contain all the flags and include/link directories combined, which is redundant.

Lower standard to C++17 to allow Ubuntu 32bit builds

f424850

Remove boost from Android github workflow

c023429

Fix typo in boost removal

4e758c5

Remove ICU dependency

9af2748

Add <unistd.h> for _exit() on Android

dc9998e

Back up to C++20

7f10728

Grumbel force-pushed the feature/c++20 branch from fe7c967 to 7f10728 Compare July 24, 2022 14:16

Remove newly introduced boost dependencies

8445933

mrkubax10 closed this Jul 27, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Move SuperTux to C++20 #1728

Move SuperTux to C++20 #1728

Grumbel commented Apr 19, 2021

Grumbel commented Apr 20, 2021 •

edited

Loading

Semphriss commented Apr 20, 2021

Grumbel commented Apr 22, 2021

jwakely Aug 9, 2021 •

edited

Loading

jwakely Aug 9, 2021

jwakely Aug 9, 2021

mrkubax10 commented Jun 11, 2023

mrkubax10 commented Jul 27, 2023

	for (std::filesystem::directory_iterator itr(olduserpath); itr != end_itr; ++itr) {
	for (const auto& file : std::filesystem::directory_iterator(olduserpath)) {

	std::filesystem::rename(itr->path().string().c_str(), userpath / itr->path().filename());
	std::filesystem::rename(itr->path(), userpath / itr->path().filename());

		@@ -16,6 +16,8 @@

		#include "supertux/game_session.hpp"

		#include <cfloat>

Move SuperTux to C++20 #1728

Move SuperTux to C++20 #1728

Conversation

Grumbel commented Apr 19, 2021

Grumbel commented Apr 20, 2021 • edited Loading

Semphriss commented Apr 20, 2021

Grumbel commented Apr 22, 2021

jwakely Aug 9, 2021 • edited Loading

Choose a reason for hiding this comment

jwakely Aug 9, 2021

Choose a reason for hiding this comment

jwakely Aug 9, 2021

Choose a reason for hiding this comment

mrkubax10 commented Jun 11, 2023

mrkubax10 commented Jul 27, 2023

Grumbel commented Apr 20, 2021 •

edited

Loading

jwakely Aug 9, 2021 •

edited

Loading