From 3262e2fe9ec93ad2c24e1b117bf87fb6f4b6ffec Mon Sep 17 00:00:00 2001 From: dann frazier Date: Fri, 31 Aug 2018 09:28:27 -0600 Subject: [PATCH 101/103] ped_unit_get_name: Resolve conflicting attributes 'const' and 'pure' The const and pure attributes conflict: error: ignoring attribute 'const' because it conflicts with attribute 'pure' [-Werror=attributes] pure functions may access global memory, const functions may not. ped_unit_get_name() accesses non-local variable unit_names, so drop const. Signed-off-by: Brian C. Lane --- include/parted/unit.in.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/parted/unit.in.h b/include/parted/unit.in.h index 9d6e06a..315660d 100644 --- a/include/parted/unit.in.h +++ b/include/parted/unit.in.h @@ -66,7 +66,7 @@ typedef enum { extern long long ped_unit_get_size (const PedDevice* dev, PedUnit unit); extern const char *ped_unit_get_name (PedUnit unit) - _GL_ATTRIBUTE_PURE _GL_ATTRIBUTE_CONST; + _GL_ATTRIBUTE_PURE; extern PedUnit ped_unit_get_by_name (const char* unit_name) _GL_ATTRIBUTE_PURE; extern void ped_unit_set_default (PedUnit unit); -- 2.17.2