From 6ad296507a74e81e18b929824b51a4fa43667eb6 Mon Sep 17 00:00:00 2001 From: Tommaso Bonvicini Date: Thu, 4 Dec 2025 17:14:39 +0100 Subject: [PATCH] Cleanup include usage --- src/fast_type_gen/fast_type_gen.cpp | 1 - src/fast_type_gen/indented_ostream.h | 1 - src/mfast/allocator.cpp | 1 - src/mfast/allocator.h | 1 - src/mfast/arena_allocator.cpp | 2 +- src/mfast/arena_allocator.h | 1 - src/mfast/coder/common/codec_helper.h | 1 - src/mfast/coder/common/debug_stream.h | 2 +- src/mfast/coder/common/dictionary_builder.cpp | 3 --- src/mfast/coder/common/dictionary_builder.h | 2 +- src/mfast/coder/decoder/decoder_field_operator.cpp | 1 - src/mfast/coder/decoder/fast_decoder.cpp | 4 ---- src/mfast/coder/decoder/fast_istreambuf.h | 3 --- src/mfast/coder/decoder_v2/fast_decoder_core.h | 6 +----- src/mfast/coder/encoder/encoder_field_operator.cpp | 1 - src/mfast/coder/encoder/fast_encoder.cpp | 3 --- src/mfast/coder/encoder/fast_ostream.h | 2 +- src/mfast/coder/encoder/fast_ostreambuf.cpp | 3 ++- src/mfast/coder/encoder/fast_ostreambuf.h | 2 +- src/mfast/coder/encoder_v2/fast_encoder_core.cpp | 1 + src/mfast/coder/encoder_v2/fast_encoder_core.h | 3 --- src/mfast/coder/encoder_v2/fast_ostream_inserter.h | 1 - src/mfast/coder/fast_decoder.h | 1 + src/mfast/coder/fast_decoder_v2.h | 1 - src/mfast/coder/fast_encoder.h | 1 + src/mfast/coder/fast_encoder_v2.h | 1 - src/mfast/decimal_ref.cpp | 5 ----- src/mfast/decimal_ref.h | 2 -- src/mfast/enum_ref.h | 1 - src/mfast/field_comparator.h | 1 - src/mfast/field_ref.h | 4 +--- src/mfast/field_visitor.h | 1 - src/mfast/group_ref.h | 1 - src/mfast/instructions/decimal_instruction.cpp | 2 +- src/mfast/instructions/field_instruction.h | 1 - src/mfast/int_ref.h | 1 - src/mfast/json/json.h | 3 ++- src/mfast/json/json_decode.cpp | 4 ++++ src/mfast/json/json_encode.cpp | 3 +++ src/mfast/malloc_allocator.cpp | 2 ++ src/mfast/malloc_allocator.h | 1 - src/mfast/message_ref.h | 3 +-- src/mfast/nested_message_ref.h | 1 - src/mfast/sequence_ref.cpp | 1 - src/mfast/sequence_ref.h | 2 -- src/mfast/set_ref.h | 1 - src/mfast/string_ref.h | 1 - src/mfast/vector_ref.h | 1 - src/mfast/view_iterator.h | 1 - src/mfast/xml_parser/FastXMLVisitor.cpp | 1 - src/mfast/xml_parser/FastXMLVisitor.h | 2 -- src/mfast/xml_parser/dynamic_templates_description.h | 2 +- src/mfast/xml_parser/field_builder.cpp | 1 - src/mfast/xml_parser/field_builder_base.h | 1 - src/mfast/xml_parser/field_op.cpp | 1 + src/mfast/xml_parser/field_op.h | 3 --- src/mfast/xml_parser/templates_builder.cpp | 1 + src/mfast/xml_parser/templates_builder.h | 4 +--- src/mfast/xml_parser/view_info_builder.cpp | 1 - 59 files changed, 29 insertions(+), 80 deletions(-) diff --git a/src/fast_type_gen/fast_type_gen.cpp b/src/fast_type_gen/fast_type_gen.cpp index 5939b8ef..6e40fbf8 100644 --- a/src/fast_type_gen/fast_type_gen.cpp +++ b/src/fast_type_gen/fast_type_gen.cpp @@ -9,7 +9,6 @@ #include "hpp_gen.h" #include "inl_gen.h" #include "cpp_gen.h" -#include "mfast/coder/common/dictionary_builder.h" #include "mfast/coder/common/template_repo.h" #include diff --git a/src/fast_type_gen/indented_ostream.h b/src/fast_type_gen/indented_ostream.h index 3711bf59..dced1660 100644 --- a/src/fast_type_gen/indented_ostream.h +++ b/src/fast_type_gen/indented_ostream.h @@ -5,7 +5,6 @@ // See the file license.txt for licensing information. #pragma once -#include #include #include struct indent_t {}; diff --git a/src/mfast/allocator.cpp b/src/mfast/allocator.cpp index 3f9465f2..7992dff1 100644 --- a/src/mfast/allocator.cpp +++ b/src/mfast/allocator.cpp @@ -4,7 +4,6 @@ // This file is part of mFAST. // See the file license.txt for licensing information. #include "allocator.h" -#include #include "allocator_utils.h" #include diff --git a/src/mfast/allocator.h b/src/mfast/allocator.h index 141ab8e1..b4ddbf3c 100644 --- a/src/mfast/allocator.h +++ b/src/mfast/allocator.h @@ -6,7 +6,6 @@ #pragma once #include -#include #include "mfast/mfast_export.h" namespace mfast { /// An abstract interface for allocators. diff --git a/src/mfast/arena_allocator.cpp b/src/mfast/arena_allocator.cpp index 8df71601..6dac8f6c 100644 --- a/src/mfast/arena_allocator.cpp +++ b/src/mfast/arena_allocator.cpp @@ -6,8 +6,8 @@ #include "arena_allocator.h" #include "allocator_utils.h" #include -#include #include +#include namespace mfast { diff --git a/src/mfast/arena_allocator.h b/src/mfast/arena_allocator.h index 5143908b..9d3d0231 100644 --- a/src/mfast/arena_allocator.h +++ b/src/mfast/arena_allocator.h @@ -5,7 +5,6 @@ // See the file license.txt for licensing information. #pragma once -#include #include #include #include diff --git a/src/mfast/coder/common/codec_helper.h b/src/mfast/coder/common/codec_helper.h index 81bfdc0b..baca4c24 100644 --- a/src/mfast/coder/common/codec_helper.h +++ b/src/mfast/coder/common/codec_helper.h @@ -7,7 +7,6 @@ #include "../../string_ref.h" #include "../../exceptions.h" -#include namespace mfast { namespace detail { diff --git a/src/mfast/coder/common/debug_stream.h b/src/mfast/coder/common/debug_stream.h index 43410c8a..85110ce3 100644 --- a/src/mfast/coder/common/debug_stream.h +++ b/src/mfast/coder/common/debug_stream.h @@ -6,7 +6,6 @@ #pragma once #include -#include "../../output.h" #ifdef NDEBUG struct debug_stream { @@ -25,6 +24,7 @@ struct debug_stream { }; #else +#include "../../output.h" class debug_stream { private: diff --git a/src/mfast/coder/common/dictionary_builder.cpp b/src/mfast/coder/common/dictionary_builder.cpp index 76125c78..862560c7 100644 --- a/src/mfast/coder/common/dictionary_builder.cpp +++ b/src/mfast/coder/common/dictionary_builder.cpp @@ -6,9 +6,6 @@ #include "exceptions.h" #include "template_repo.h" #include -#include -#include -#include namespace mfast { diff --git a/src/mfast/coder/common/dictionary_builder.h b/src/mfast/coder/common/dictionary_builder.h index 6b013343..d9ef80a9 100644 --- a/src/mfast/coder/common/dictionary_builder.h +++ b/src/mfast/coder/common/dictionary_builder.h @@ -9,10 +9,10 @@ #include "../mfast_coder_export.h" #include "../../field_instructions.h" #include "../../arena_allocator.h" +#include "../../instructions/templates_description.h" #include #include #include -#include #ifdef _MSC_VER #pragma warning(disable : 4251) // non dll-interface class used as a member for diff --git a/src/mfast/coder/decoder/decoder_field_operator.cpp b/src/mfast/coder/decoder/decoder_field_operator.cpp index f185f6f5..68baf407 100644 --- a/src/mfast/coder/decoder/decoder_field_operator.cpp +++ b/src/mfast/coder/decoder/decoder_field_operator.cpp @@ -3,7 +3,6 @@ // // This file is part of mFAST. // See the file license.txt for licensing information. -#include "../mfast_coder_export.h" #include "../common/codec_helper.h" #include "fast_istream.h" #include "decoder_presence_map.h" diff --git a/src/mfast/coder/decoder/fast_decoder.cpp b/src/mfast/coder/decoder/fast_decoder.cpp index e08a3338..68c2c95f 100644 --- a/src/mfast/coder/decoder/fast_decoder.cpp +++ b/src/mfast/coder/decoder/fast_decoder.cpp @@ -4,17 +4,13 @@ // This file is part of mFAST. // See the file license.txt for licensing information. #include -#include "../mfast_coder_export.h" #include "../fast_decoder.h" #include "../../field_visitor.h" #include "../../sequence_ref.h" -#include "../../malloc_allocator.h" -#include "../../output.h" #include "../../composite_type.h" #include "../common/exceptions.h" #include "../common/debug_stream.h" #include "../common/template_repo.h" -#include "../common/codec_helper.h" #include "decoder_presence_map.h" #include "decoder_field_operator.h" #include "fast_istream.h" diff --git a/src/mfast/coder/decoder/fast_istreambuf.h b/src/mfast/coder/decoder/fast_istreambuf.h index 7ed444c9..39c64250 100644 --- a/src/mfast/coder/decoder/fast_istreambuf.h +++ b/src/mfast/coder/decoder/fast_istreambuf.h @@ -5,10 +5,7 @@ // See the file license.txt for licensing information. #pragma once -#include - #include "../../exceptions.h" -#include namespace mfast { class fast_istream; diff --git a/src/mfast/coder/decoder_v2/fast_decoder_core.h b/src/mfast/coder/decoder_v2/fast_decoder_core.h index c0a865f8..e2ec2203 100644 --- a/src/mfast/coder/decoder_v2/fast_decoder_core.h +++ b/src/mfast/coder/decoder_v2/fast_decoder_core.h @@ -7,20 +7,16 @@ #include "../mfast_coder_export.h" -#include "../../sequence_ref.h" +#include "../../ext_ref.h" #include "../../nested_message_ref.h" -#include "../../malloc_allocator.h" -#include "../../output.h" #include "../../composite_type.h" #include "../common/exceptions.h" -#include "../common/debug_stream.h" #include "../common/template_repo.h" #include "../common/codec_helper.h" #include "../decoder/decoder_presence_map.h" #include "../common/codec_helper.h" #include "../decoder/fast_istream.h" #include "fast_istream_extractor.h" -#include #include namespace mfast { namespace coder { diff --git a/src/mfast/coder/encoder/encoder_field_operator.cpp b/src/mfast/coder/encoder/encoder_field_operator.cpp index 9150f711..2dfbbab7 100644 --- a/src/mfast/coder/encoder/encoder_field_operator.cpp +++ b/src/mfast/coder/encoder/encoder_field_operator.cpp @@ -5,7 +5,6 @@ // See the file license.txt for licensing information. #include #include -#include "../mfast_coder_export.h" #include "../common/codec_helper.h" #include "fast_ostream.h" #include "encoder_presence_map.h" diff --git a/src/mfast/coder/encoder/fast_encoder.cpp b/src/mfast/coder/encoder/fast_encoder.cpp index 1b35666a..71403e2b 100644 --- a/src/mfast/coder/encoder/fast_encoder.cpp +++ b/src/mfast/coder/encoder/fast_encoder.cpp @@ -3,14 +3,11 @@ // // This file is part of mFAST. // See the file license.txt for licensing information. -#include "../mfast_coder_export.h" #include "../../field_visitor.h" #include "../../sequence_ref.h" -#include "../../malloc_allocator.h" #include "../fast_encoder.h" #include "../common/template_repo.h" #include "../common/exceptions.h" -#include "../../output.h" #include "encoder_presence_map.h" #include "encoder_field_operator.h" #include "fast_ostream.h" diff --git a/src/mfast/coder/encoder/fast_ostream.h b/src/mfast/coder/encoder/fast_ostream.h index 946ba570..cd9aabac 100644 --- a/src/mfast/coder/encoder/fast_ostream.h +++ b/src/mfast/coder/encoder/fast_ostream.h @@ -5,9 +5,9 @@ // See the file license.txt for licensing information. #pragma once -#include "../../field_instructions.h" #include "../common/codec_helper.h" #include "fast_ostreambuf.h" +#include namespace mfast { class encoder_presence_map; diff --git a/src/mfast/coder/encoder/fast_ostreambuf.cpp b/src/mfast/coder/encoder/fast_ostreambuf.cpp index 46c66064..5492f7f5 100644 --- a/src/mfast/coder/encoder/fast_ostreambuf.cpp +++ b/src/mfast/coder/encoder/fast_ostreambuf.cpp @@ -3,8 +3,9 @@ // // This file is part of mFAST. // See the file license.txt for licensing information. -#include #include +#include +#include #include "fast_ostreambuf.h" namespace mfast { diff --git a/src/mfast/coder/encoder/fast_ostreambuf.h b/src/mfast/coder/encoder/fast_ostreambuf.h index 722421c8..7d7b98f8 100644 --- a/src/mfast/coder/encoder/fast_ostreambuf.h +++ b/src/mfast/coder/encoder/fast_ostreambuf.h @@ -7,7 +7,7 @@ #include #include "../mfast_coder_export.h" -#include "../../exceptions.h" +#include namespace mfast { class buffer_overflow_error : public virtual boost::exception, diff --git a/src/mfast/coder/encoder_v2/fast_encoder_core.cpp b/src/mfast/coder/encoder_v2/fast_encoder_core.cpp index 71be2ccd..c18231ac 100644 --- a/src/mfast/coder/encoder_v2/fast_encoder_core.cpp +++ b/src/mfast/coder/encoder_v2/fast_encoder_core.cpp @@ -1,4 +1,5 @@ #include "fast_encoder_core.h" +#include "../common/exceptions.h" namespace mfast { namespace coder { diff --git a/src/mfast/coder/encoder_v2/fast_encoder_core.h b/src/mfast/coder/encoder_v2/fast_encoder_core.h index 6a706c3a..5a007301 100644 --- a/src/mfast/coder/encoder_v2/fast_encoder_core.h +++ b/src/mfast/coder/encoder_v2/fast_encoder_core.h @@ -1,12 +1,9 @@ #pragma once #include "../mfast_coder_export.h" -#include "../../sequence_ref.h" #include "../../enum_ref.h" #include "../../nested_message_ref.h" -#include "../../malloc_allocator.h" #include "../common/template_repo.h" -#include "../common/exceptions.h" #include "../encoder/fast_ostream.h" #include "../encoder/resizable_fast_ostreambuf.h" #include "../encoder/encoder_presence_map.h" diff --git a/src/mfast/coder/encoder_v2/fast_ostream_inserter.h b/src/mfast/coder/encoder_v2/fast_ostream_inserter.h index cb764d6a..e99548aa 100644 --- a/src/mfast/coder/encoder_v2/fast_ostream_inserter.h +++ b/src/mfast/coder/encoder_v2/fast_ostream_inserter.h @@ -1,6 +1,5 @@ #pragma once -#include "../../int_ref.h" #include "../../string_ref.h" #include "../../decimal_ref.h" #include "../../ext_ref.h" diff --git a/src/mfast/coder/fast_decoder.h b/src/mfast/coder/fast_decoder.h index dfde5a54..fc9b775a 100644 --- a/src/mfast/coder/fast_decoder.h +++ b/src/mfast/coder/fast_decoder.h @@ -6,6 +6,7 @@ #pragma once #include "mfast_coder_export.h" +#include "../instructions/templates_description.h" #include "../message_ref.h" #include "../malloc_allocator.h" #include diff --git a/src/mfast/coder/fast_decoder_v2.h b/src/mfast/coder/fast_decoder_v2.h index b6e8ea74..e7814cd1 100644 --- a/src/mfast/coder/fast_decoder_v2.h +++ b/src/mfast/coder/fast_decoder_v2.h @@ -7,7 +7,6 @@ #include "decoder_v2/fast_decoder_core.h" #include -#include template struct all_true; diff --git a/src/mfast/coder/fast_encoder.h b/src/mfast/coder/fast_encoder.h index acfb472b..d0da88c1 100644 --- a/src/mfast/coder/fast_encoder.h +++ b/src/mfast/coder/fast_encoder.h @@ -6,6 +6,7 @@ #pragma once #include "mfast_coder_export.h" +#include "../instructions/templates_description.h" #include "../message_ref.h" #include "../malloc_allocator.h" diff --git a/src/mfast/coder/fast_encoder_v2.h b/src/mfast/coder/fast_encoder_v2.h index 6a61eb60..626f163d 100644 --- a/src/mfast/coder/fast_encoder_v2.h +++ b/src/mfast/coder/fast_encoder_v2.h @@ -6,7 +6,6 @@ #pragma once #include -#include #include "encoder_v2/fast_encoder_core.h" namespace mfast { diff --git a/src/mfast/decimal_ref.cpp b/src/mfast/decimal_ref.cpp index 160048fe..8dfcfc03 100644 --- a/src/mfast/decimal_ref.cpp +++ b/src/mfast/decimal_ref.cpp @@ -3,11 +3,6 @@ // // This file is part of mFAST. // See the file license.txt for licensing information. -#include -#include - -#include - #include #include diff --git a/src/mfast/decimal_ref.h b/src/mfast/decimal_ref.h index 80268ed6..1397d4be 100644 --- a/src/mfast/decimal_ref.h +++ b/src/mfast/decimal_ref.h @@ -5,8 +5,6 @@ // See the file license.txt for licensing information. #pragma once -#include -#include #include #include "mfast_export.h" #include "field_ref.h" diff --git a/src/mfast/enum_ref.h b/src/mfast/enum_ref.h index 33e7ab15..aadbe4af 100644 --- a/src/mfast/enum_ref.h +++ b/src/mfast/enum_ref.h @@ -5,7 +5,6 @@ // See the file license.txt for licensing information. #pragma once -#include "mfast/field_instructions.h" #include "mfast/field_ref.h" #include "mfast/type_category.h" diff --git a/src/mfast/field_comparator.h b/src/mfast/field_comparator.h index cf2ab807..37491251 100644 --- a/src/mfast/field_comparator.h +++ b/src/mfast/field_comparator.h @@ -4,7 +4,6 @@ // This file is part of mFAST. // See the file license.txt for licensing information. #pragma once -#include #include "field_visitor.h" namespace mfast { namespace detail { diff --git a/src/mfast/field_ref.h b/src/mfast/field_ref.h index 2e09c27f..e7c87d85 100644 --- a/src/mfast/field_ref.h +++ b/src/mfast/field_ref.h @@ -6,10 +6,8 @@ #pragma once #include "field_instructions.h" -#include -#include +#include "mfast_export.h" #include -#include #include #include diff --git a/src/mfast/field_visitor.h b/src/mfast/field_visitor.h index c5cb5668..c7afc4e6 100644 --- a/src/mfast/field_visitor.h +++ b/src/mfast/field_visitor.h @@ -11,7 +11,6 @@ #include "string_ref.h" #include "group_ref.h" #include "sequence_ref.h" -#include "message_ref.h" #include "nested_message_ref.h" #include "set_ref.h" diff --git a/src/mfast/group_ref.h b/src/mfast/group_ref.h index e9182a07..36eb6841 100644 --- a/src/mfast/group_ref.h +++ b/src/mfast/group_ref.h @@ -5,7 +5,6 @@ // See the file license.txt for licensing information. #pragma once -#include "field_instructions.h" #include "field_ref.h" #include "field_mref.h" #include "aggregate_ref.h" diff --git a/src/mfast/instructions/decimal_instruction.cpp b/src/mfast/instructions/decimal_instruction.cpp index 90b953c0..3cca7a79 100644 --- a/src/mfast/instructions/decimal_instruction.cpp +++ b/src/mfast/instructions/decimal_instruction.cpp @@ -4,7 +4,7 @@ // This file is part of mFAST. // See the file license.txt for licensing information. -#include "../field_instructions.h" +#include "decimal_instruction.h" namespace mfast { void decimal_field_instruction::construct_value(value_storage &storage, diff --git a/src/mfast/instructions/field_instruction.h b/src/mfast/instructions/field_instruction.h index 8d0cd26c..89488c0f 100644 --- a/src/mfast/instructions/field_instruction.h +++ b/src/mfast/instructions/field_instruction.h @@ -12,7 +12,6 @@ #include "mfast/mfast_export.h" #include "mfast/arena_allocator.h" #include "mfast/allocator.h" -#include #include namespace mfast { diff --git a/src/mfast/int_ref.h b/src/mfast/int_ref.h index fd688098..b3ed8e5f 100644 --- a/src/mfast/int_ref.h +++ b/src/mfast/int_ref.h @@ -5,7 +5,6 @@ // See the file license.txt for licensing information. #pragma once -#include "field_instructions.h" #include "field_ref.h" #include "type_category.h" diff --git a/src/mfast/json/json.h b/src/mfast/json/json.h index 3116cc75..1886f827 100644 --- a/src/mfast/json/json.h +++ b/src/mfast/json/json.h @@ -8,7 +8,8 @@ #define MFAST_JSON_H #include "mfast_json_export.h" -#include "../../mfast.h" +#include "../aggregate_ref.h" +#include "../sequence_ref.h" #include namespace mfast { diff --git a/src/mfast/json/json_decode.cpp b/src/mfast/json/json_decode.cpp index 213099fc..07a1db8c 100644 --- a/src/mfast/json/json_decode.cpp +++ b/src/mfast/json/json_decode.cpp @@ -4,6 +4,10 @@ // This file is part of mFAST. // See the file license.txt for licensing information. #include "json.h" +#include "../enum_ref.h" +#include "../group_ref.h" +#include "../field_visitor.h" +#include "../nested_message_ref.h" #include namespace mfast { diff --git a/src/mfast/json/json_encode.cpp b/src/mfast/json/json_encode.cpp index 69ff6288..b563ee32 100644 --- a/src/mfast/json/json_encode.cpp +++ b/src/mfast/json/json_encode.cpp @@ -4,6 +4,9 @@ // This file is part of mFAST. // See the file license.txt for licensing information. #include "json.h" +#include "../enum_ref.h" +#include "../field_visitor.h" +#include "../nested_message_ref.h" #include #include #ifdef _MSC_VER // someday someone at microsoft will read the C++11 standard. diff --git a/src/mfast/malloc_allocator.cpp b/src/mfast/malloc_allocator.cpp index 5f876941..60c09ef0 100644 --- a/src/mfast/malloc_allocator.cpp +++ b/src/mfast/malloc_allocator.cpp @@ -4,6 +4,8 @@ // This file is part of mFAST. // See the file license.txt for licensing information. #include "malloc_allocator.h" +#include +#include namespace mfast { diff --git a/src/mfast/malloc_allocator.h b/src/mfast/malloc_allocator.h index 46ac61c1..0b32f683 100644 --- a/src/mfast/malloc_allocator.h +++ b/src/mfast/malloc_allocator.h @@ -6,7 +6,6 @@ #pragma once #include "allocator.h" #include -#include namespace mfast { class MFAST_EXPORT malloc_allocator : public allocator { diff --git a/src/mfast/message_ref.h b/src/mfast/message_ref.h index 078b0bdf..211a63b7 100644 --- a/src/mfast/message_ref.h +++ b/src/mfast/message_ref.h @@ -6,10 +6,9 @@ #pragma once #include -#include "field_instructions.h" #include "allocator.h" #include "field_ref.h" -#include "group_ref.h" +#include "aggregate_ref.h" // #include "mfast/nested_message_ref.h" namespace mfast { struct fast_decoder_impl; diff --git a/src/mfast/nested_message_ref.h b/src/mfast/nested_message_ref.h index affd090d..13a17a1e 100644 --- a/src/mfast/nested_message_ref.h +++ b/src/mfast/nested_message_ref.h @@ -5,7 +5,6 @@ // See the file license.txt for licensing information. #pragma once -#include "field_instructions.h" #include "field_ref.h" #include "message_ref.h" #include "type_category.h" diff --git a/src/mfast/sequence_ref.cpp b/src/mfast/sequence_ref.cpp index e022011b..7551c3ac 100644 --- a/src/mfast/sequence_ref.cpp +++ b/src/mfast/sequence_ref.cpp @@ -5,7 +5,6 @@ // See the file license.txt for licensing information. #include "mfast/sequence_ref.h" #include "mfast/allocator.h" -#include namespace mfast { namespace detail { diff --git a/src/mfast/sequence_ref.h b/src/mfast/sequence_ref.h index 84c7a212..384abac9 100644 --- a/src/mfast/sequence_ref.h +++ b/src/mfast/sequence_ref.h @@ -5,9 +5,7 @@ // See the file license.txt for licensing information. #pragma once -#include "field_instructions.h" #include "field_ref.h" -#include "group_ref.h" #include "aggregate_ref.h" #include diff --git a/src/mfast/set_ref.h b/src/mfast/set_ref.h index c72e1ff1..6d0adcdb 100644 --- a/src/mfast/set_ref.h +++ b/src/mfast/set_ref.h @@ -5,7 +5,6 @@ // See the file license.txt for licensing information. #pragma once -#include "mfast/field_instructions.h" #include "mfast/field_ref.h" #include "mfast/type_category.h" diff --git a/src/mfast/string_ref.h b/src/mfast/string_ref.h index fa79fbd6..87d01fa2 100644 --- a/src/mfast/string_ref.h +++ b/src/mfast/string_ref.h @@ -5,7 +5,6 @@ // See the file license.txt for licensing information. #pragma once -#include #include "field_ref.h" #include "vector_ref.h" #include diff --git a/src/mfast/vector_ref.h b/src/mfast/vector_ref.h index 4aa6092d..c453bc41 100644 --- a/src/mfast/vector_ref.h +++ b/src/mfast/vector_ref.h @@ -8,7 +8,6 @@ #include #include #include -#include #include "field_ref.h" #include "allocator.h" #include "type_category.h" diff --git a/src/mfast/view_iterator.h b/src/mfast/view_iterator.h index 8a62cc4f..a12b18e8 100644 --- a/src/mfast/view_iterator.h +++ b/src/mfast/view_iterator.h @@ -5,7 +5,6 @@ // See the file license.txt for licensing information. #pragma once -#include "field_instructions.h" #include "aggregate_ref.h" #include "field_ref.h" #include diff --git a/src/mfast/xml_parser/FastXMLVisitor.cpp b/src/mfast/xml_parser/FastXMLVisitor.cpp index 3d5ec99c..ac04f65d 100644 --- a/src/mfast/xml_parser/FastXMLVisitor.cpp +++ b/src/mfast/xml_parser/FastXMLVisitor.cpp @@ -7,7 +7,6 @@ #include "xml_util.h" #include #include -#include const char *FastXMLVisitor::get_optional_attr(const XMLElement &element, const char *attr_name, const char *default_value) const { diff --git a/src/mfast/xml_parser/FastXMLVisitor.h b/src/mfast/xml_parser/FastXMLVisitor.h index 71f238a1..8fe1682d 100644 --- a/src/mfast/xml_parser/FastXMLVisitor.h +++ b/src/mfast/xml_parser/FastXMLVisitor.h @@ -6,8 +6,6 @@ #pragma once #include #include -#include -#include #include #include #include diff --git a/src/mfast/xml_parser/dynamic_templates_description.h b/src/mfast/xml_parser/dynamic_templates_description.h index 58447bc1..fcf7df84 100644 --- a/src/mfast/xml_parser/dynamic_templates_description.h +++ b/src/mfast/xml_parser/dynamic_templates_description.h @@ -6,7 +6,7 @@ #pragma once #include "mfast_xml_parser_export.h" -#include "../field_instructions.h" +#include "../instructions/templates_description.h" #include "../arena_allocator.h" #include "../view_iterator.h" #include diff --git a/src/mfast/xml_parser/field_builder.cpp b/src/mfast/xml_parser/field_builder.cpp index a228b653..367d7ba2 100644 --- a/src/mfast/xml_parser/field_builder.cpp +++ b/src/mfast/xml_parser/field_builder.cpp @@ -8,7 +8,6 @@ #include "../exceptions.h" #include #include -#include "mfast/field_instructions.h" using namespace tinyxml2; diff --git a/src/mfast/xml_parser/field_builder_base.h b/src/mfast/xml_parser/field_builder_base.h index d1a6e7b6..5201386d 100644 --- a/src/mfast/xml_parser/field_builder_base.h +++ b/src/mfast/xml_parser/field_builder_base.h @@ -5,7 +5,6 @@ // See the file license.txt for licensing information. #pragma once -#include #include #include "xml_util.h" #include "template_registry_impl.h" diff --git a/src/mfast/xml_parser/field_op.cpp b/src/mfast/xml_parser/field_op.cpp index c4fa1d79..87335f1d 100644 --- a/src/mfast/xml_parser/field_op.cpp +++ b/src/mfast/xml_parser/field_op.cpp @@ -7,6 +7,7 @@ #include #include #include "field_op.h" +#include "../exceptions.h" #include "../instructions/decimal_instruction.h" #include "../instructions/byte_vector_instruction.h" using namespace boost::assign; diff --git a/src/mfast/xml_parser/field_op.h b/src/mfast/xml_parser/field_op.h index e5ff8437..e258f15e 100644 --- a/src/mfast/xml_parser/field_op.h +++ b/src/mfast/xml_parser/field_op.h @@ -4,13 +4,10 @@ // This file is part of mFAST. // See the file license.txt for licensing information. #pragma once -#include -#include #include #include "../arena_allocator.h" #include "../instructions/field_instruction.h" #include "xml_util.h" -#include "../exceptions.h" namespace mfast { class decimal_field_instruction; diff --git a/src/mfast/xml_parser/templates_builder.cpp b/src/mfast/xml_parser/templates_builder.cpp index eac48531..88341c69 100644 --- a/src/mfast/xml_parser/templates_builder.cpp +++ b/src/mfast/xml_parser/templates_builder.cpp @@ -4,6 +4,7 @@ // This file is part of mFAST. // See the file license.txt for licensing information. #include "templates_builder.h" +#include "field_builder.h" #include "../boolean_ref.h" #include "view_info_builder.h" #include "../exceptions.h" diff --git a/src/mfast/xml_parser/templates_builder.h b/src/mfast/xml_parser/templates_builder.h index 35afed6c..f6f4933b 100644 --- a/src/mfast/xml_parser/templates_builder.h +++ b/src/mfast/xml_parser/templates_builder.h @@ -1,9 +1,7 @@ #pragma once -#include -#include "../field_instructions.h" #include "tinyxml2.h" -#include "field_builder.h" +#include "field_builder_base.h" #include "dynamic_templates_description.h" #include diff --git a/src/mfast/xml_parser/view_info_builder.cpp b/src/mfast/xml_parser/view_info_builder.cpp index aed1cfe0..ee59ccec 100644 --- a/src/mfast/xml_parser/view_info_builder.cpp +++ b/src/mfast/xml_parser/view_info_builder.cpp @@ -1,5 +1,4 @@ #include -#include #include "view_info_builder.h" #include "xml_util.h" #include "../exceptions.h"