diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 00c6afd..32f4031 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -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: ""
@@ -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"
 
diff --git a/include/boost/stl_interfaces/fwd.hpp b/include/boost/stl_interfaces/fwd.hpp
index fdb883c..2d9ad0d 100644
--- a/include/boost/stl_interfaces/fwd.hpp
+++ b/include/boost/stl_interfaces/fwd.hpp
@@ -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
diff --git a/include/boost/stl_interfaces/view_adaptor.hpp b/include/boost/stl_interfaces/view_adaptor.hpp
index aa84702..a0e2c55 100644
--- a/include/boost/stl_interfaces/view_adaptor.hpp
+++ b/include/boost/stl_interfaces/view_adaptor.hpp
@@ -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