Skip to content

Commit f160c75

Browse files
committed
Eliminate various warnings
These changes eliminate various warnings that show up on modern compilers.
1 parent b269d76 commit f160c75

File tree

5 files changed

+15
-18
lines changed

5 files changed

+15
-18
lines changed

perl++/source/exporter.C

+4-5
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,21 @@ namespace perl {
88
void* get_magic_ptr(const MAGIC* magic) {
99
return magic->mg_ptr;
1010
}
11-
void* get_magic_ptr(interpreter* interp, SV* var, int min_length) {
11+
void* get_magic_ptr(interpreter*, SV* var, int min_length) {
1212
const MAGIC* magic = mg_find(var, PERL_MAGIC_ext);
1313
if (magic == NULL || magic->mg_ptr == NULL || ( magic->mg_len < min_length && magic->mg_len != 0 ) ) {
1414
throw Runtime_exception("Magic error");
1515
}
1616
return magic->mg_ptr;
1717
}
18-
const Raw_string get_magic_string(interpreter* interp, SV* var) {
18+
const Raw_string get_magic_string(interpreter*, SV* var) {
1919
const MAGIC* tmp = mg_find(var, PERL_MAGIC_ext);
2020
return tmp != NULL ? Raw_string(tmp->mg_ptr, tmp->mg_len, false) : Raw_string(NULL, 0, false);
2121
}
22-
bool has_magic_string(interpreter* interp, SV* var) {
22+
bool has_magic_string(interpreter*, SV* var) {
2323
return mg_find(var, PERL_MAGIC_ext) != NULL;
2424
}
2525
bool has_magic_string(const Scalar::Base& var) {
26-
interpreter* const interp = var.interp;
2726
return mg_find(var.get_SV(false), PERL_MAGIC_ext) != NULL;
2827
}
2928
void set_magic_string(interpreter* interp, SV* var, Raw_string string) {
@@ -40,7 +39,7 @@ namespace perl {
4039
SV* const ret = newRV_noinc(referee);
4140
return sv_bless(ret, gv_stashpv(state.classname, true));
4241
}
43-
void* get_magic_object_impl(interpreter* interp, SV* var, int min_length) {
42+
void* get_magic_object_impl(interpreter*, SV* var, int min_length) {
4443
MAGIC* tmp = mg_find(SvRV(var), PERL_MAGIC_ext);
4544
if (tmp == NULL || tmp->mg_ptr == NULL || tmp->mg_len < min_length) {
4645
throw Not_an_object_exception();

t/10-integer.C

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ int main() {
2121

2222
ok(value + 1, "value + 1");
2323
not_ok(value - 1, "not: value - 1");
24-
ok(value * 1, "value * 1");
24+
is(value * 1, 1, "value * 1");
2525
ok(value / 1, "value / 1");
2626

2727
note("++value");

t/10-number.C

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ int main() {
2424
ok(!(value != 1), "not: value != 1");
2525

2626
ok(value + 1, "value + 1");
27-
ok(value * 1, "value * 1");
27+
is(value * 1, 1, "value * 1");
2828
ok(value / 1, "value / 1");
2929

3030
note("value -= 3");

t/10-uinteger.C

+7-9
Original file line numberDiff line numberDiff line change
@@ -5,41 +5,39 @@ using namespace perl;
55
using namespace TAP;
66

77
int main() {
8-
plan(17);
8+
plan(15);
99
Interpreter universe;
1010
Uinteger value = universe.value_of(1u);
1111

1212
ok(value, "value");
13-
is(value, 1, "value == 1");
1413
is(value, 1u, "value == 1u");
15-
is(value, 1l, "value == 1l");
1614

1715
ok(value > 0u, "value > 0");
1816
ok(value < 2u, "value < 2");
1917
not_ok(value != 1, "not: value != 1");
2018

2119
ok(value + 1, "value + 1");
2220
not_ok(value - 1, "not: value - 1");
23-
ok(value * 1, "value * 1");
21+
is(value * 1u, 1u, "value * 1");
2422
ok(value / 1, "value / 1");
2523

2624
note("++value");
2725
++value;
2826
ok(value, "value");
29-
is(value, 2, "value == 2");
27+
is(value, 2u, "value == 2");
3028
not_ok(value != 2, "not: value != 2");
3129

3230
note("--value");
3331
--value;
34-
is(value, 1, "value == 1");
32+
is(value, 1u, "value == 1");
3533

3634
note("value++");
3735
value++;
38-
is(value, 2, "value == 2");
36+
is(value, 2u, "value == 2");
3937

4038
note("value -= 2");
41-
value -= 2;
42-
is(value, 0, "value == 0");
39+
value -= 2u;
40+
is(value, 0u, "value == 0");
4341

4442
return exit_status();
4543
}

t/50-function-exports.C

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ const Scalar::Temp eigth(Array args) {
3636
return args[0];
3737
}
3838

39-
void ninth(const char* arg) {
39+
void ninth(const char*) {
4040
}
4141

42-
void tenth(const std::string& arg){
42+
void tenth(const std::string&){
4343
}
4444

4545
int main() {

0 commit comments

Comments
 (0)