diff options
| -rw-r--r-- | 001help.cc | 4 | ||||
| -rw-r--r-- | 003trace.cc | 2 | ||||
| -rw-r--r-- | 030container.cc | 2 | ||||
| -rw-r--r-- | 056shape_shifting_recipe.cc | 4 | ||||
| -rw-r--r-- | 073scheduler.cc | 2 | ||||
| -rw-r--r-- | subx/001help.cc | 4 | ||||
| -rw-r--r-- | subx/003trace.cc | 2 | ||||
| -rw-r--r-- | subx/020elf.cc | 4 |
8 files changed, 10 insertions, 14 deletions
diff --git a/001help.cc b/001help.cc index 280c3588..3cab06d9 100644 --- a/001help.cc +++ b/001help.cc @@ -157,7 +157,7 @@ void initialize_signal_handlers() { sigaction(SIGABRT, &action, NULL); // assert() failure or integer overflow on linux (with -ftrapv) sigaction(SIGILL, &action, NULL); // integer overflow on OS X (with -ftrapv) } -void dump_and_exit(int sig, vestigial siginfo_t*, vestigial void*) { +void dump_and_exit(int sig, siginfo_t* /*unused*/, void* /*unused*/) { switch (sig) { case SIGABRT: #ifndef __APPLE__ @@ -256,8 +256,6 @@ using std::cerr; #include <string> using std::string; -#define vestigial __attribute__((unused)) - #include <algorithm> using std::min; using std::max; diff --git a/003trace.cc b/003trace.cc index 92a6d069..20a0b48e 100644 --- a/003trace.cc +++ b/003trace.cc @@ -202,7 +202,7 @@ bool trace_contains_errors() { :(before "End Types") struct end {}; :(code) -ostream& operator<<(ostream& os, vestigial end) { +ostream& operator<<(ostream& os, end /*unused*/) { if (Trace_stream) Trace_stream->newline(); return os; } diff --git a/030container.cc b/030container.cc index 257f5fe0..aff65a1d 100644 --- a/030container.cc +++ b/030container.cc @@ -546,7 +546,7 @@ Transform.push_back(expand_type_abbreviations_in_containers); // idempotent :(code) // extremely inefficient; we process all types over and over again, once for every single recipe // but it doesn't seem to cause any noticeable slowdown -void expand_type_abbreviations_in_containers(vestigial const recipe_ordinal) { +void expand_type_abbreviations_in_containers(const recipe_ordinal /*unused*/) { for (map<type_ordinal, type_info>::iterator p = Type.begin(); p != Type.end(); ++p) { for (int i = 0; i < SIZE(p->second.elements); ++i) expand_type_abbreviations(p->second.elements.at(i).type); diff --git a/056shape_shifting_recipe.cc b/056shape_shifting_recipe.cc index d7d0f0fb..cb1a40b9 100644 --- a/056shape_shifting_recipe.cc +++ b/056shape_shifting_recipe.cc @@ -201,7 +201,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(vestigial const instruction&, recipe_ordinal r) { +int number_of_concrete_type_names(const instruction& /*unused*/, recipe_ordinal r) { const recipe& caller = get(Recipe, r); int result = 0; for (int i = 0; i < SIZE(caller.ingredients); ++i) @@ -219,7 +219,7 @@ int number_of_concrete_type_names(const type_tree* type) { + number_of_concrete_type_names(type->right); } -int number_of_type_ingredients(vestigial const instruction&, recipe_ordinal r) { +int number_of_type_ingredients(const instruction& /*unused*/, recipe_ordinal r) { const recipe& caller = get(Recipe, r); int result = 0; for (int i = 0; i < SIZE(caller.ingredients); ++i) diff --git a/073scheduler.cc b/073scheduler.cc index d9f85131..aa22bcfb 100644 --- a/073scheduler.cc +++ b/073scheduler.cc @@ -311,7 +311,7 @@ def f2 [ +error: f2: divide by zero in '3:num <- divide-with-remainder 4, 0' -error: f2: divide by zero in '4:num <- divide-with-remainder 4, 0' -:(after "operator<<(ostream& os, vestigial end)") +:(after "operator<<(ostream& os, end /*unused*/)") if (Trace_stream && Trace_stream->curr_label == "error" && Current_routine) { Current_routine->state = COMPLETED; } diff --git a/subx/001help.cc b/subx/001help.cc index 564c1211..636205ad 100644 --- a/subx/001help.cc +++ b/subx/001help.cc @@ -158,7 +158,7 @@ void initialize_signal_handlers() { sigaction(SIGABRT, &action, NULL); // assert() failure or integer overflow on linux (with -ftrapv) sigaction(SIGILL, &action, NULL); // integer overflow on OS X (with -ftrapv) } -void dump_and_exit(int sig, vestigial siginfo_t*, vestigial void*) { +void dump_and_exit(int sig, siginfo_t* /*unused*/, void* /*unused*/) { switch (sig) { case SIGABRT: #ifndef __APPLE__ @@ -256,8 +256,6 @@ using std::cerr; #include <string> using std::string; -#define vestigial __attribute__((unused)) - #include <algorithm> using std::min; using std::max; diff --git a/subx/003trace.cc b/subx/003trace.cc index 120ada82..994b5eca 100644 --- a/subx/003trace.cc +++ b/subx/003trace.cc @@ -183,7 +183,7 @@ bool trace_contains_errors() { :(before "End Types") struct end {}; :(code) -ostream& operator<<(ostream& os, vestigial end) { +ostream& operator<<(ostream& os, end /*unused*/) { if (Trace_stream) Trace_stream->newline(); return os; } diff --git a/subx/020elf.cc b/subx/020elf.cc index ca7b2483..dccf889a 100644 --- a/subx/020elf.cc +++ b/subx/020elf.cc @@ -119,7 +119,7 @@ inline uint16_t u16_in(uint8_t* p) { :(before "End Types") struct perr {}; :(code) -ostream& operator<<(ostream& os, vestigial perr) { +ostream& operator<<(ostream& os, perr /*unused*/) { if (errno) os << ": " << strerror(errno); return os; @@ -128,7 +128,7 @@ ostream& operator<<(ostream& os, vestigial perr) { :(before "End Types") struct die {}; :(code) -ostream& operator<<(vestigial ostream&, vestigial die) { +ostream& operator<<(ostream& /*unused*/, die /*unused*/) { if (Trace_stream) Trace_stream->newline(); exit(1); } |