Skip to content

Fix Apple SDK comparison #7

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

Closed
tommaisey wants to merge 3 commits into from
Closed

Fix Apple SDK comparison #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f31788b
Fix Apple SDK comparison (140000 should have been 101400)
tommaisey Jun 6, 2025
354d7c7
Update Catch2 version to fix build error
tommaisey Jun 6, 2025
0692afd
Other build error fixes
tommaisey Jun 6, 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
39 changes: 24 additions & 15 deletions include/realtime_memory/pmr_includes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,31 +1,40 @@
#include <algorithm>
#include <atomic>
#include <cassert>
#include <stdexcept>
#include <utility>
#include <vector>


#if defined (__apple_build_version__)
#define USE_EXPERIMENTAL_PMR __apple_build_version__ < 15000000 || __MAC_OS_X_VERSION_MIN_REQUIRED < 140000
#elif defined (__clang__)
#define USE_EXPERIMENTAL_PMR _LIBCPP_VERSION < 1600
#if (__apple_build_version__ < 1500000)
#define USE_EXPERIMENTAL_PMR 1
#elif defined (__MAC_OS_X_VERSION_MIN_REQUIRED) && (__MAC_OS_X_VERSION_MIN_REQUIRED < 101400)
#define USE_EXPERIMENTAL_PMR 1
#else
#define USE_EXPERIMENTAL_PMR 0
#endif
#elif defined (__clang__) && (_LIBCPP_VERSION < 1600)
#define USE_EXPERIMENTAL_PMR 1
#else
#define USE_EXPERIMENTAL_PMR 0
#define USE_EXPERIMENTAL_PMR 0
#endif

#if USE_EXPERIMENTAL_PMR
#include <experimental/memory_resource>
namespace std_pmr = std::experimental::pmr;
#include <experimental/memory_resource>
namespace std_pmr = std::experimental::pmr;
#else
#include <memory_resource>
namespace std_pmr = std::pmr;
#include <memory_resource>
namespace std_pmr = std::pmr;
#endif

#if defined (__apple_build_version__) && USE_EXPERIMENTAL_PMR
#define PMR_DIAGNOSTIC_PUSH \
_Pragma("clang diagnostic push") \
_Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"")
#define PMR_DIAGNOSTIC_POP \
_Pragma("clang diagnostic pop")
#define PMR_DIAGNOSTIC_PUSH \
_Pragma("clang diagnostic push") \
_Pragma("clang diagnostic ignored \"-Wdeprecated-declarations\"")
#define PMR_DIAGNOSTIC_POP \
_Pragma("clang diagnostic pop")
#else
#define PMR_DIAGNOSTIC_PUSH
#define PMR_DIAGNOSTIC_POP
#define PMR_DIAGNOSTIC_PUSH
#define PMR_DIAGNOSTIC_POP
#endif
2 changes: 1 addition & 1 deletion tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ cmake_minimum_required(VERSION 3.12)
Include(FetchContent)
FetchContent_Declare(Catch2
GIT_REPOSITORY https://github.com/catchorg/Catch2.git
GIT_TAG v3.0.1) # or a later release
GIT_TAG v3.8.1) # or a later release
FetchContent_MakeAvailable(Catch2)

add_executable(realtime_memory_tests
Expand Down
2 changes: 2 additions & 0 deletions tests/resource_tests.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
// Copyright (c) 2019-2023 CradleApps, LLC - All Rights Reserved
//==============================================================================

#include <numeric>
#include <random>
#include <unordered_set>
#include <unordered_map>

Expand Down