Mercurial > octave
changeset 30495:358295cdc0a4
maint: Merge stable to default.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Wed, 15 Dec 2021 22:09:12 -0500 |
parents | 6fc9847bd302 (current diff) ba5370c670d5 (diff) |
children | 9eee1d667949 |
files | libinterp/corefcn/mex.cc |
diffstat | 1 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/libinterp/corefcn/mex.cc Wed Dec 15 21:29:44 2021 -0500 +++ b/libinterp/corefcn/mex.cc Wed Dec 15 22:09:12 2021 -0500 @@ -40,7 +40,9 @@ #include <limits> #include <map> -#include <memory_resource> +#if defined (HAVE_STD_PMR_POLYMORPHIC_ALLOCATOR) +# include <memory_resource> +#endif #include <set> #include <string> @@ -337,7 +339,6 @@ }; #if defined (HAVE_STD_PMR_POLYMORPHIC_ALLOCATOR) -# include <memory_resource> class mx_memory_resource : public std::pmr::memory_resource { @@ -368,6 +369,7 @@ // FIXME: Is it OK for the memory resource object to be defined this // way? static mx_memory_resource the_mx_memory_resource; + #endif // ------------------------------------------------------------------