Index: src/APs/AP210.cc =================================================================== --- src/APs/AP210.cc (revision 843) +++ src/APs/AP210.cc (working copy) @@ -201,7 +201,7 @@ delete var_D.data; var_D.data = new CDR_string(buffer, nb); - delete buffer; + delete[] buffer; return 0; } else if (code == 'D') // char (var size) Index: src/Tokenizer.cc =================================================================== --- src/Tokenizer.cc (revision 843) +++ src/Tokenizer.cc (working copy) @@ -601,7 +601,7 @@ bool imag_need_float = false; const bool imag_valid = tokenize_real(src, imag_need_float, imag_flt, imag_int); - if (!imag_need_float) imag_flt = imag_flt; + if (!imag_need_float) (void)imag_flt; if (!imag_valid) { @@ -634,7 +634,7 @@ bool imag_need_float = false; const bool imag_valid = tokenize_real(src, imag_need_float, degrees_flt, degrees_int); - if (!imag_need_float) degrees_flt = degrees_flt; + if (!imag_need_float) (void)degrees_flt; if (!imag_valid) {