diff --git a/srecord/input/file.cc b/srecord/input/file.cc index 9908e191..38ffcbe5 100644 --- a/srecord/input/file.cc +++ b/srecord/input/file.cc @@ -27,17 +27,6 @@ bool srecord::input_file::ignore_checksums_default = false; -srecord::input_file::input_file() : - file_name("standard input"), - line_number(1), - prev_was_newline(false), - vfp(stdin), - checksum(0), - ignore_checksums(ignore_checksums_default) -{ -} - - bool srecord::input_file::is_binary() const diff --git a/srecord/input/file.h b/srecord/input/file.h index d746e71e..a84aa0c9 100644 --- a/srecord/input/file.h +++ b/srecord/input/file.h @@ -322,17 +322,17 @@ class input_file: /** * The default constructor. Do not use. */ - input_file(); + input_file() = delete; /** * The copy constructor. Do not use. */ - input_file(const input_file &); + input_file(const input_file &) = delete; /** * the assignment operator. Do not use. */ - input_file &operator=(const input_file &); + input_file &operator=(const input_file &) = delete; }; }; diff --git a/srecord/input/file/needham.h b/srecord/input/file/needham.h index 31e63860..7b9dfba6 100644 --- a/srecord/input/file/needham.h +++ b/srecord/input/file/needham.h @@ -74,17 +74,17 @@ class input_file_needham: /** * The default constructor. Do not use. */ - input_file_needham(); + input_file_needham() = delete; /** * The copy constructor. Do not use. */ - input_file_needham(const input_file_needham &); + input_file_needham(const input_file_needham &) = delete; /** * The assignment operator. Do not use. */ - input_file_needham &operator=(const input_file_needham &); + input_file_needham &operator=(const input_file_needham &) = delete; }; }; diff --git a/srecord/input/file/tektronix_extended.h b/srecord/input/file/tektronix_extended.h index 8bb29f04..0e141bd4 100644 --- a/srecord/input/file/tektronix_extended.h +++ b/srecord/input/file/tektronix_extended.h @@ -128,8 +128,7 @@ class input_file_tektronix_extended: /** * The assignment operator. Do not use. */ - input_file_tektronix_extended &operator=( - const input_file_tektronix_extended &) = delete; + input_file_tektronix_extended &operator=(const input_file_tektronix_extended &) = delete; }; }; diff --git a/srecord/input/file/ti_tagged.h b/srecord/input/file/ti_tagged.h index 71b623de..79ec441e 100644 --- a/srecord/input/file/ti_tagged.h +++ b/srecord/input/file/ti_tagged.h @@ -96,17 +96,17 @@ class input_file_ti_tagged: /** * The default constructor. Do not use. */ - input_file_ti_tagged(); + input_file_ti_tagged() = delete; /** * The copy constructor. Do not use. */ - input_file_ti_tagged(const input_file_ti_tagged &); + input_file_ti_tagged(const input_file_ti_tagged &) = delete; /** * The assignment operator. Do not use. */ - input_file_ti_tagged &operator=(const input_file_ti_tagged &); + input_file_ti_tagged &operator=(const input_file_ti_tagged &) = delete; }; }; diff --git a/srecord/input/file/ti_tagged_16.h b/srecord/input/file/ti_tagged_16.h index d8e69cd1..1e2ab2d8 100644 --- a/srecord/input/file/ti_tagged_16.h +++ b/srecord/input/file/ti_tagged_16.h @@ -96,17 +96,17 @@ class input_file_ti_tagged_16: /** * The default constructor. Do not use. */ - input_file_ti_tagged_16(); + input_file_ti_tagged_16() = delete; /** * The copy constructor. Do not use. */ - input_file_ti_tagged_16(const input_file_ti_tagged_16 &); + input_file_ti_tagged_16(const input_file_ti_tagged_16 &) = delete; /** * The assignment operator. Do not use. */ - input_file_ti_tagged_16 &operator=(const input_file_ti_tagged_16 &); + input_file_ti_tagged_16 &operator=(const input_file_ti_tagged_16 &) = delete; }; }; diff --git a/srecord/input/filter/checksum/bitnot.h b/srecord/input/filter/checksum/bitnot.h index 6db20c27..63353367 100644 --- a/srecord/input/filter/checksum/bitnot.h +++ b/srecord/input/filter/checksum/bitnot.h @@ -99,8 +99,7 @@ class input_filter_checksum_bitnot: /** * The assignment operator. Do not use. */ - input_filter_checksum_bitnot &operator=( - const input_filter_checksum_bitnot &) = delete; + input_filter_checksum_bitnot &operator=(const input_filter_checksum_bitnot &) = delete; }; }; diff --git a/srecord/input/filter/checksum/negative.h b/srecord/input/filter/checksum/negative.h index d71ce675..9522cd0c 100644 --- a/srecord/input/filter/checksum/negative.h +++ b/srecord/input/filter/checksum/negative.h @@ -98,8 +98,7 @@ class input_filter_checksum_negative: /** * The assignment operator. Do not use. */ - input_filter_checksum_negative &operator=( - const input_filter_checksum_negative &) = delete; + input_filter_checksum_negative &operator=(const input_filter_checksum_negative &) = delete; }; }; diff --git a/srecord/input/filter/checksum/positive.h b/srecord/input/filter/checksum/positive.h index 21a05386..14ed8547 100644 --- a/srecord/input/filter/checksum/positive.h +++ b/srecord/input/filter/checksum/positive.h @@ -98,8 +98,7 @@ class input_filter_checksum_positive: /** * The assignment operator. Do not use. */ - input_filter_checksum_positive &operator=( - const input_filter_checksum_positive &) = delete; + input_filter_checksum_positive &operator=(const input_filter_checksum_positive &) = delete; }; }; diff --git a/srecord/input/filter/interval/minimum.h b/srecord/input/filter/interval/minimum.h index f63cf118..7ad51652 100644 --- a/srecord/input/filter/interval/minimum.h +++ b/srecord/input/filter/interval/minimum.h @@ -94,8 +94,7 @@ class input_filter_interval_minimum: /** * The assignment operator. Do not use. */ - input_filter_interval_minimum &operator=( - const input_filter_interval_minimum &) = delete; + input_filter_interval_minimum &operator=(const input_filter_interval_minimum &) = delete; }; }; diff --git a/srecord/input/filter/message/adler16.h b/srecord/input/filter/message/adler16.h index 6da95abe..b4c5b1bc 100644 --- a/srecord/input/filter/message/adler16.h +++ b/srecord/input/filter/message/adler16.h @@ -102,8 +102,7 @@ class input_filter_message_adler16: /** * The assignment operator. Do not use. */ - input_filter_message_adler16 &operator=( - const input_filter_message_adler16 &) = delete; + input_filter_message_adler16 &operator=(const input_filter_message_adler16 &) = delete; }; }; diff --git a/srecord/input/filter/message/adler32.h b/srecord/input/filter/message/adler32.h index b9eb62e2..6703e8fe 100644 --- a/srecord/input/filter/message/adler32.h +++ b/srecord/input/filter/message/adler32.h @@ -97,14 +97,12 @@ class input_filter_message_adler32: /** * The copy constructor. Do not use. */ - input_filter_message_adler32( - const input_filter_message_adler32 &) = delete; + input_filter_message_adler32(const input_filter_message_adler32 &) = delete; /** * The assignment operator. Do not use. */ - input_filter_message_adler32 &operator=( - const input_filter_message_adler32 &) = delete; + input_filter_message_adler32 &operator=(const input_filter_message_adler32 &) = delete; }; }; diff --git a/srecord/input/filter/message/fletcher16.h b/srecord/input/filter/message/fletcher16.h index 9c5ba737..63729588 100644 --- a/srecord/input/filter/message/fletcher16.h +++ b/srecord/input/filter/message/fletcher16.h @@ -111,8 +111,7 @@ class input_filter_message_fletcher16: /** * The assignment operator. Do not use. */ - input_filter_message_fletcher16 &operator=( - const input_filter_message_fletcher16 &) = delete; + input_filter_message_fletcher16 &operator=(const input_filter_message_fletcher16 &) = delete; }; }; diff --git a/srecord/input/filter/message/fletcher32.h b/srecord/input/filter/message/fletcher32.h index 9ec6fedc..b86fd4bd 100644 --- a/srecord/input/filter/message/fletcher32.h +++ b/srecord/input/filter/message/fletcher32.h @@ -102,8 +102,7 @@ class input_filter_message_fletcher32: /** * The assignment operator. Do not use. */ - input_filter_message_fletcher32 &operator=( - const input_filter_message_fletcher32 &) = delete; + input_filter_message_fletcher32 &operator=(const input_filter_message_fletcher32 &) = delete; }; }; diff --git a/srecord/output/file.h b/srecord/output/file.h index 2be3b176..a14dbc67 100644 --- a/srecord/output/file.h +++ b/srecord/output/file.h @@ -440,12 +440,12 @@ class output_file: /** * The copy constructor. Do not use. */ - output_file(const output_file &); + output_file(const output_file &) = delete; /** * The assignment operator. Do not use. */ - output_file &operator=(const output_file &); + output_file &operator=(const output_file &) = delete; }; }; diff --git a/srecord/output/file/asm.h b/srecord/output/file/asm.h index b00159f4..3dbf2602 100644 --- a/srecord/output/file/asm.h +++ b/srecord/output/file/asm.h @@ -185,17 +185,17 @@ class output_file_asm: /** * The default constructor. Do not use. */ - output_file_asm(); + output_file_asm() = delete; /** * The copy constructor. Do not use. */ - output_file_asm(const output_file_asm &); + output_file_asm(const output_file_asm &) = delete; /** * The assignment operator. Do not use. */ - output_file_asm &operator=(const output_file_asm &); + output_file_asm &operator=(const output_file_asm &) = delete; }; }; diff --git a/srecord/output/file/emon52.h b/srecord/output/file/emon52.h index b7a2b979..df077b85 100644 --- a/srecord/output/file/emon52.h +++ b/srecord/output/file/emon52.h @@ -97,17 +97,17 @@ class output_file_emon52: /** * The default constructor. Do not use. */ - output_file_emon52(); + output_file_emon52() = delete; /** * The copy constructor. Do not use. */ - output_file_emon52(const output_file_emon52 &); + output_file_emon52(const output_file_emon52 &) = delete; /** * The assignment operator. Do not use. */ - output_file_emon52 &operator=(const output_file_emon52 &); + output_file_emon52 &operator=(const output_file_emon52 &) = delete; }; }; diff --git a/srecord/output/file/fastload.h b/srecord/output/file/fastload.h index 77959fd4..2b58a55e 100644 --- a/srecord/output/file/fastload.h +++ b/srecord/output/file/fastload.h @@ -143,17 +143,17 @@ class output_file_fastload: /** * The default constructor. Do not use. */ - output_file_fastload(); + output_file_fastload() = delete; /** * The copy constructor. Do not use. */ - output_file_fastload(const output_file_fastload &); + output_file_fastload(const output_file_fastload &) = delete; /** * The assignment operator. Do not use. */ - output_file_fastload &operator=(const output_file_fastload &); + output_file_fastload &operator=(const output_file_fastload &) = delete; }; }; diff --git a/srecord/output/file/formatted_binary.h b/srecord/output/file/formatted_binary.h index 5e11b489..50dd7128 100644 --- a/srecord/output/file/formatted_binary.h +++ b/srecord/output/file/formatted_binary.h @@ -115,8 +115,7 @@ class output_file_formatted_binary: /** * The assignment operator. Do not use. */ - output_file_formatted_binary &operator=( - const output_file_formatted_binary &) = delete; + output_file_formatted_binary &operator=(const output_file_formatted_binary &) = delete; }; }; diff --git a/srecord/output/file/four_packed_code.h b/srecord/output/file/four_packed_code.h index 83c615b2..99952d8a 100644 --- a/srecord/output/file/four_packed_code.h +++ b/srecord/output/file/four_packed_code.h @@ -128,8 +128,7 @@ class output_file_four_packed_code: /** * The assignment operator. Do not use. */ - output_file_four_packed_code &operator=( - const output_file_four_packed_code &) = delete; + output_file_four_packed_code &operator=(const output_file_four_packed_code &) = delete; }; }; diff --git a/srecord/output/file/mips_flash.h b/srecord/output/file/mips_flash.h index 0decd796..4147fea1 100644 --- a/srecord/output/file/mips_flash.h +++ b/srecord/output/file/mips_flash.h @@ -164,17 +164,17 @@ class output_file_mips_flash: /** * The default constructor. Do not use. */ - output_file_mips_flash(); + output_file_mips_flash() = delete; /** * The copy constructor. Do not use. */ - output_file_mips_flash(const output_file_mips_flash &); + output_file_mips_flash(const output_file_mips_flash &) = delete; /** * The assignment operator. Do not use. */ - output_file_mips_flash &operator=(const output_file_mips_flash &); + output_file_mips_flash &operator=(const output_file_mips_flash &) = delete; }; }; diff --git a/srecord/output/file/mos_tech.h b/srecord/output/file/mos_tech.h index 47245994..ba84618c 100644 --- a/srecord/output/file/mos_tech.h +++ b/srecord/output/file/mos_tech.h @@ -103,17 +103,17 @@ class output_file_mos_tech: /** * The default constructor. Do not use. */ - output_file_mos_tech(); + output_file_mos_tech() = delete; /** * The copy constructor. Do not use. */ - output_file_mos_tech(const output_file_mos_tech &); + output_file_mos_tech(const output_file_mos_tech &) = delete; /** * The assignment operator. Do not use. */ - output_file_mos_tech &operator=(const output_file_mos_tech &); + output_file_mos_tech &operator=(const output_file_mos_tech &) = delete; }; }; diff --git a/srecord/output/file/signetics.h b/srecord/output/file/signetics.h index ae456337..682f48ac 100644 --- a/srecord/output/file/signetics.h +++ b/srecord/output/file/signetics.h @@ -110,17 +110,17 @@ class output_file_signetics: /** * The default constructor. Do not use. */ - output_file_signetics(); + output_file_signetics() = delete; /** * The copy constructor. Do not use. */ - output_file_signetics(const output_file_signetics &); + output_file_signetics(const output_file_signetics &) = delete; /** * The assignment operator. Do not use. */ - output_file_signetics &operator=(const output_file_signetics &); + output_file_signetics &operator=(const output_file_signetics &) = delete; }; }; diff --git a/srecord/output/file/trs80.h b/srecord/output/file/trs80.h index 5f203d67..1040928a 100644 --- a/srecord/output/file/trs80.h +++ b/srecord/output/file/trs80.h @@ -121,17 +121,17 @@ class output_file_trs80: /** * The default constructor. Do not use. */ - output_file_trs80(); + output_file_trs80() = delete; /** * The copy constructor. Do not use. */ - output_file_trs80(const output_file_trs80 &); + output_file_trs80(const output_file_trs80 &) = delete; /** * The assignment operator. Do not use. */ - output_file_trs80 &operator=(const output_file_trs80 &); + output_file_trs80 &operator=(const output_file_trs80 &) = delete; }; };