diff options
| author | Kartik K. Agaram <vc@akkartik.com> | 2018-04-20 00:06:38 -0700 |
|---|---|---|
| committer | Kartik K. Agaram <vc@akkartik.com> | 2018-04-20 00:06:38 -0700 |
| commit | 26a5d50613a3c6cc60f9b6206df15772964eb853 (patch) | |
| tree | a1bb5b80290a424dbdc436c0a125b4aba6cef697 /056shape_shifting_recipe.cc | |
| parent | 8878326574db7c121ce1bc06b3014eb1986946cc (diff) | |
| download | mu-26a5d50613a3c6cc60f9b6206df15772964eb853.tar.gz | |
4235 - fix a build issue for Apple clang 900.0.38
The trouble with rewriting 'unused' to '__attribute__(unused)' is that if we happen to deliberately introduce '__attribute__(unused)' somehow, say in the standard headers, then it gets expanded twice to '__attribute__(__attribute__(unused))'. So we switch to a synonym.
Diffstat (limited to '056shape_shifting_recipe.cc')
| -rw-r--r-- | 056shape_shifting_recipe.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/056shape_shifting_recipe.cc b/056shape_shifting_recipe.cc index bbea9e1e..29d443c2 100644 --- a/056shape_shifting_recipe.cc +++ b/056shape_shifting_recipe.cc @@ -205,7 +205,7 @@ bool contains_type_ingredient_name(const type_tree* type) { return contains_type_ingredient_name(type->left) || contains_type_ingredient_name(type->right); } -int number_of_concrete_type_names(unused const instruction& inst, recipe_ordinal r) { +int number_of_concrete_type_names(vestigial const instruction& inst, recipe_ordinal r) { const recipe& caller = get(Recipe, r); int result = 0; for (int i = 0; i < SIZE(caller.ingredients); ++i) @@ -223,7 +223,7 @@ int number_of_concrete_type_names(const type_tree* type) { + number_of_concrete_type_names(type->right); } -int number_of_type_ingredients(unused const instruction& inst, recipe_ordinal r) { +int number_of_type_ingredients(vestigial const instruction& inst, recipe_ordinal r) { const recipe& caller = get(Recipe, r); int result = 0; for (int i = 0; i < SIZE(caller.ingredients); ++i) |