Skip to content

build: Support C++26, and test it in CI in the bleeding edge test #5230

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lgritz wants to merge 1 commit into
base: main
Choose a base branch
from
+23 −9
Open

build: Support C++26, and test it in CI in the bleeding edge test #5230

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -298,13 +298,13 @@ jobs:
EXTRA_DEP_PACKAGES="clang-format-17"
CLANG_FORMAT_EXE=clang-format-17

- desc: latest releases gcc15 C++20 py3.12 avx2 exr3.4 ocio2.4
- desc: latest releases gcc15 C++23 py3.12 avx2 exr3.4 ocio2.4
nametag: linux-latest-releases
oiio_python_bindings_backend: both
runner: ubuntu-24.04
# cc_compiler: gcc-13
# cxx_compiler: g++-13
cxx_std: 20
cxx_std: 23
fmt_ver: 12.1.0
fmt_commit: 407c905e45ad75fc29bf0f9bb7c5c2fd3475976f
opencolorio_ver: v2.5.0
Expand All @@ -331,12 +331,12 @@ jobs:
# like this test to have minimal missing dependencies.
required_deps: all
optional_deps: 'CUDAToolkit;DCMTK;JXL;Nuke;OpenCV;OpenGL;OpenVDB;R3DSDK'
- desc: bleeding edge gcc16 C++23 py3.12 OCIO/libtiff/exr-main avx2
- desc: bleeding edge gcc16 C++26 py3.12 OCIO/libtiff/exr-main avx2
nametag: linux-bleeding-edge
runner: ubuntu-24.04
# cc_compiler: gcc-15
# cxx_compiler: g++-15
cxx_std: 23
cxx_std: 26
fmt_ver: main
opencolorio_ver: main
openexr_ver: main
Expand Down
4 changes: 3 additions & 1 deletion INSTALL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,11 @@ NEW or CHANGED MINIMUM dependencies since the last major release are **bold**.

### Required dependencies -- OIIO will not build at all without these

* C++17 or higher (also builds with C++20 and C++23)
* C++17 or higher (also builds with C++20, C++23, and C++26)
* The default build mode is C++17. This can be controlled by via the
CMake configuration flag: `-DCMAKE_CXX_STANDARD=20`, etc.
* Note that no matter which version you compile with internally,
OIIO's public APIs only require C++17 features.
* Compilers: gcc 9.3 - 15.2, clang 10 - 22, MSVS 2017 - 2026 (v19.14
and up), Intel OneAPI C++ compiler 2022+.
* CMake >= 3.18.2 (tested through 4.3)
Expand Down
16 changes: 13 additions & 3 deletions src/include/OpenImageIO/platform.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,10 @@
// See https://en.cppreference.com/w/cpp/compiler_support
//
// OIIO_CPLUSPLUS_VERSION : which C++ standard is compiling (14, 17, ...)
// OIIO_CONSTEXPR17 :
// OIIO_CONSTEXPR20 : constexpr for C++ >= the designated version, otherwise
// OIIO_CONSTEXPR17 : depreated, always `constexpr`
// OIIO_CONSTEXPR20 :
// OIIO_CONSTEXPR23 :
// OIIO_CONSTEXPR26 : constexpr for C++ >= the designated version, otherwise
// nothing (this is useful for things that can only be
// constexpr for particular versions or greater).
//
Expand All @@ -187,18 +189,26 @@
// package is compiling against OIIO and using these headers (OIIO may be
// C++17 but the client package may be newer, or vice versa -- use these two
// symbols to differentiate these cases, when important).
#if (__cplusplus >= 202302L)
#if (__cplusplus >= 202603L)
# define OIIO_CPLUSPLUS_VERSION 26
# define OIIO_CONSTEXPR20 constexpr
# define OIIO_CONSTEXPR23 constexpr
# define OIIO_CONSTEXPR26 constexpr
#elif (__cplusplus >= 202302L)
# define OIIO_CPLUSPLUS_VERSION 23
# define OIIO_CONSTEXPR20 constexpr
# define OIIO_CONSTEXPR23 constexpr
# define OIIO_CONSTEXPR26 /* not constexpr before C++26 */
#elif (__cplusplus >= 202001L)
# define OIIO_CPLUSPLUS_VERSION 20
# define OIIO_CONSTEXPR20 constexpr
# define OIIO_CONSTEXPR23 /* not constexpr before C++23 */
# define OIIO_CONSTEXPR26 /* not constexpr before C++26 */
#elif (__cplusplus >= 201703L) || (defined(_MSC_VER) && _MSC_VER >= 1914)
# define OIIO_CPLUSPLUS_VERSION 17
# define OIIO_CONSTEXPR20 /* not constexpr before C++20 */
# define OIIO_CONSTEXPR23 /* not constexpr before C++23 */
# define OIIO_CONSTEXPR26 /* not constexpr before C++26 */
#else
# error "This version of OIIO is meant to work only with C++17 and above"
#endif
Expand Down
4 changes: 3 additions & 1 deletion src/include/OpenImageIO/strongparam.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,9 @@ template<typename Tag, typename Basetype> struct StrongParam {

private:
Basetype m_val;
static_assert(std::is_trivial<Basetype>::value, "Need trivial type");
static_assert(std::is_trivially_copyable_v<Basetype>
&& std::is_trivially_copyable_v<Basetype>,
Comment on lines +110 to +111

@kmilos kmilos Jun 12, 2026

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copypasta?

"Need trivial type");
};

OIIO_NAMESPACE_3_1_END
Expand Down
Loading