From 443dc632d44324c54e2ddcf176342bddfd14e6b0 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Thu, 20 Jan 2022 09:40:34 -0500 Subject: [PATCH] common: rename struct mmap_align to mmap_align_data In C++, g++ complains that the mmap_align free function shadows the constructor of the structure of the same name. Rename the structure to mmap_align_data to avoid that. Change-Id: Iae5e0175e3530ebc51804602240ca3037bc02c5b Signed-off-by: Simon Marchi Reviewed-on: https://review.lttng.org/c/babeltrace/+/7099 Reviewed-by: Philippe Proulx --- src/common/mmap-align.h | 12 ++++++------ src/ctfser/ctfser.h | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/common/mmap-align.h b/src/common/mmap-align.h index 7a5ed990..d2750241 100644 --- a/src/common/mmap-align.h +++ b/src/common/mmap-align.h @@ -22,7 +22,7 @@ * cannot be forced, so we allocate at an address chosen by the OS. */ -struct mmap_align { +struct mmap_align_data { void *page_aligned_addr; /* mmap address, aligned to floor */ size_t page_aligned_length; /* mmap length, containing range */ @@ -37,10 +37,10 @@ off_t get_page_aligned_offset(off_t offset, int log_level) } static inline -struct mmap_align *mmap_align(size_t length, int prot, +struct mmap_align_data *mmap_align(size_t length, int prot, int flags, int fd, off_t offset, int log_level) { - struct mmap_align *mma; + struct mmap_align_data *mma; off_t page_aligned_offset; /* mmap offset, aligned to floor */ size_t page_size; @@ -69,7 +69,7 @@ struct mmap_align *mmap_align(size_t length, int prot, } static inline -int munmap_align(struct mmap_align *mma) +int munmap_align(struct mmap_align_data *mma) { void *page_aligned_addr; size_t page_aligned_length; @@ -81,7 +81,7 @@ int munmap_align(struct mmap_align *mma) } static inline -void *mmap_align_addr(struct mmap_align *mma) +void *mmap_align_addr(struct mmap_align_data *mma) { return mma->addr; } @@ -90,7 +90,7 @@ void *mmap_align_addr(struct mmap_align *mma) * Helper for special-cases, normally unused. */ static inline -void mmap_align_set_addr(struct mmap_align *mma, void *addr) +void mmap_align_set_addr(struct mmap_align_data *mma, void *addr) { mma->addr = addr; } diff --git a/src/ctfser/ctfser.h b/src/ctfser/ctfser.h index b9e710d9..2abe65a3 100644 --- a/src/ctfser/ctfser.h +++ b/src/ctfser/ctfser.h @@ -53,7 +53,7 @@ struct bt_ctfser { uint64_t stream_size_bytes; /* Memory map base address */ - struct mmap_align *base_mma; + struct mmap_align_data *base_mma; /* Stream file's path (for debugging) */ GString *path; -- 2.34.1