Skip to content

Use std::alligned_alloc since c++17 #27136

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
wants to merge 1 commit into from
Closed

Use std::alligned_alloc since c++17 #27136

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
14 changes: 11 additions & 3 deletions modules/core/src/alloc.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,7 @@

//#define OPENCV_ALLOC_ENABLE_STATISTICS


#ifdef HAVE_POSIX_MEMALIGN
#if defined(HAVE_POSIX_MEMALIGN) || (__cplusplus >= 201703L)
#include <stdlib.h>
#elif defined HAVE_MALLOC_H
#include <malloc.h>
Expand Down Expand Up @@ -130,6 +129,15 @@ void* fastMalloc_(size_t size)
void* fastMalloc(size_t size)
#endif
{
#if __cplusplus >= 201703L
if (isAlignedAllocationEnabled())
{
void* ptr = std::aligned_alloc(size, CV_MALLOC_ALIGN);
if(!ptr)
return OutOfMemoryError(size);
return ptr;
}
#endif
#ifdef HAVE_POSIX_MEMALIGN
if (isAlignedAllocationEnabled())
{
Expand Down Expand Up @@ -172,7 +180,7 @@ void fastFree_(void* ptr)
void fastFree(void* ptr)
#endif
{
#if defined HAVE_POSIX_MEMALIGN || defined HAVE_MEMALIGN
#if defined HAVE_POSIX_MEMALIGN || defined HAVE_MEMALIGN || (__cplusplus >= 201703L)
if (isAlignedAllocationEnabled())
{
free(ptr);
Expand Down
Loading
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy