diff --git a/cmake/ProtocolHelpers.cmake b/cmake/ProtocolHelpers.cmake index 40617262..85e27741 100644 --- a/cmake/ProtocolHelpers.cmake +++ b/cmake/ProtocolHelpers.cmake @@ -54,7 +54,8 @@ function(ccbench_add_protocol name) -Werror=reorder -Werror=unused-parameter -Werror=catch-value - -Werror=unused-variable) + -Werror=unused-variable + -Werror=ignored-qualifiers) set_property(TARGET ${target} PROPERTY CCBENCH_PROTOCOL "${name}") set_property(TARGET ${target} PROPERTY CCBENCH_WORKLOAD "${wl}") diff --git a/include/bomb.hh b/include/bomb.hh index e7247a17..3c82bcd6 100644 --- a/include/bomb.hh +++ b/include/bomb.hh @@ -503,15 +503,15 @@ public: } }; - static const uint32_t get_i_id_product_start() { + static uint32_t get_i_id_product_start() { return 1; } - static const uint32_t get_i_id_material_start() { + static uint32_t get_i_id_material_start() { return get_i_id_product_start() + FLAGS_bomb_product_size; } - static const uint32_t get_i_id_work_start() { + static uint32_t get_i_id_work_start() { return get_i_id_material_start() + FLAGS_bomb_material_size; } diff --git a/include/bomb_pessimistic.hh b/include/bomb_pessimistic.hh index f2983414..3fcdcd87 100644 --- a/include/bomb_pessimistic.hh +++ b/include/bomb_pessimistic.hh @@ -537,15 +537,15 @@ public: } }; - static const uint32_t get_i_id_product_start() { + static uint32_t get_i_id_product_start() { return 1; } - static const uint32_t get_i_id_material_start() { + static uint32_t get_i_id_material_start() { return get_i_id_product_start() + FLAGS_bomb_product_size; } - static const uint32_t get_i_id_work_start() { + static uint32_t get_i_id_work_start() { return get_i_id_material_start() + FLAGS_bomb_material_size; }