Skip to content

Use BOOST_GCC, defined in config.hpp only for real (non-Clang-emulate… #77

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

Merged
tzlaine merged 2 commits into from
Feb 21, 2025
Merged

Use BOOST_GCC, defined in config.hpp only for real (non-Clang-emulate… #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ab41007
Use BOOST_GCC, defined in config.hpp only for real (non-Clang-emulate…
tzlaine Feb 21, 2025
223ffb7
MacOS 12 -> 13 in Github action builds.
tzlaine Feb 21, 2025
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
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ jobs:
- name: "ASAN=on MAC_OSX=true Job 1"
buildtype: "boost"
packages: ""
os: "macos-12"
os: "macos-13"
cxx: "clang++"
sources: ""
llvm_os: ""
Expand All @@ -199,12 +199,12 @@ jobs:
- name: "ASAN=on MAC_OSX=true Job 2"
buildtype: "boost"
packages: ""
os: "macos-12"
os: "macos-13"
cxx: "clang++"
sources: ""
llvm_os: ""
llvm_ver: ""
xcode_version: "13.4.1"
xcode_version: "15.2"
asan: "on"
mac_osx: "true"

Expand Down
4 changes: 2 additions & 2 deletions include/boost/stl_interfaces/fwd.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@

#ifndef BOOST_STL_INTERFACES_DOXYGEN

#if defined(_MSC_VER) || defined(__GNUC__) && __GNUC__ < 8
#if defined(_MSC_VER) || defined(BOOST_GCC) && __GNUC__ < 8
#define BOOST_STL_INTERFACES_NO_HIDDEN_FRIEND_CONSTEXPR
#define BOOST_STL_INTERFACES_HIDDEN_FRIEND_CONSTEXPR
#else
#define BOOST_STL_INTERFACES_HIDDEN_FRIEND_CONSTEXPR constexpr
#endif

#if defined(__GNUC__) && __GNUC__ < 9
#if defined(BOOST_GCC) && __GNUC__ < 9
#define BOOST_STL_INTERFACES_CONCEPT concept bool
#else
#define BOOST_STL_INTERFACES_CONCEPT concept
Expand Down
2 changes: 1 addition & 1 deletion include/boost/stl_interfaces/view_adaptor.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
#endif

#if !BOOST_STL_INTERFACES_USE_CPP23_STD_RANGE_ADAPTOR_CLOSURE && \
BOOST_STL_INTERFACES_USE_CONCEPTS && defined(__GNUC__) && 12 <= __GNUC__
BOOST_STL_INTERFACES_USE_CONCEPTS && defined(BOOST_GCC) && 12 <= __GNUC__
#define BOOST_STL_INTERFACES_USE_LIBSTDCPP_GCC12_RANGE_ADAPTOR_CLOSURE 1
#else
#define BOOST_STL_INTERFACES_USE_LIBSTDCPP_GCC12_RANGE_ADAPTOR_CLOSURE 0
Expand Down
Loading