diff --git a/src/base/bitunion.test.cc b/src/base/bitunion.test.cc index 06c7a615e9..be92bfa853 100644 --- a/src/base/bitunion.test.cc +++ b/src/base/bitunion.test.cc @@ -129,7 +129,7 @@ containingFunc(uint64_t init_val, uint64_t fieldVal) // Declare these as global so g++ doesn't ignore them. Initialize them in // various ways. EmptySixtyFour emptySixtyFour = 0; -EmptyThirtyTwo emptyThirtyTwo{}; +[[maybe_unused]] EmptyThirtyTwo emptyThirtyTwo{}; [[maybe_unused]] EmptySixteen emptySixteen; EmptyEight emptyEight(0); diff --git a/src/base/compiler.hh b/src/base/compiler.hh index 29375c1900..9c80c3ef09 100644 --- a/src/base/compiler.hh +++ b/src/base/compiler.hh @@ -90,7 +90,7 @@ // This version is for macros which are statement-like, which frequently use // "do {} while (0)" to make their syntax look more like normal c++ statements. # define GEM5_DEPRECATED_MACRO_STMT(name, definition, message) \ - do {{definition;} GEM5_DEPRECATED_MACRO(name, {}, message);} while (0) + do {{definition;} GEM5_DEPRECATED_MACRO(name, ({}), message);} while (0) // To mark a class as deprecated in favor of a new name, add a respective // instance of this macro to the file that used to declare the old name.