From 1d7373c1ca2baeb2a7809099340b357daf69e5d3 Mon Sep 17 00:00:00 2001 From: Michael Tautschnig Date: Wed, 23 Mar 2022 23:26:35 +0000 Subject: [PATCH 1/2] Add missing #include cassert is implicitly provided via nonstd/optional, but this will change with the move to std::optional. The even better fix would be the replacement of all uses of assert(...) in these files, but this is a larger endeavour. --- src/ansi-c/c_typecheck_expr.cpp | 1 + src/ansi-c/c_typecheck_initializer.cpp | 2 ++ src/ansi-c/c_typecheck_type.cpp | 1 + src/cpp/cpp_instantiate_template.cpp | 2 ++ src/cpp/cpp_typecheck.cpp | 1 + src/cpp/cpp_typecheck_code.cpp | 2 ++ src/cpp/cpp_typecheck_compound_type.cpp | 1 + src/cpp/cpp_typecheck_constructor.cpp | 2 ++ src/cpp/cpp_typecheck_conversions.cpp | 2 ++ src/cpp/cpp_typecheck_expr.cpp | 2 ++ src/cpp/cpp_typecheck_resolve.cpp | 1 + src/cpp/cpp_typecheck_template.cpp | 2 ++ src/cpp/cpp_typecheck_type.cpp | 2 ++ src/cpp/parse.cpp | 1 + src/goto-diff/change_impact.cpp | 1 + src/goto-instrument/goto_program2code.cpp | 1 + src/goto-instrument/k_induction.cpp | 2 ++ src/goto-instrument/unwind.cpp | 2 ++ src/goto-instrument/wmm/cycle_collection.cpp | 2 ++ src/goto-instrument/wmm/event_graph.cpp | 1 + src/goto-instrument/wmm/goto2graph.cpp | 1 + 21 files changed, 32 insertions(+) diff --git a/src/ansi-c/c_typecheck_expr.cpp b/src/ansi-c/c_typecheck_expr.cpp index 63bfaa3fff0..5626c9f2379 100644 --- a/src/ansi-c/c_typecheck_expr.cpp +++ b/src/ansi-c/c_typecheck_expr.cpp @@ -11,6 +11,7 @@ Author: Daniel Kroening, kroening@kroening.com #include "c_typecheck_base.h" +#include #include #include diff --git a/src/ansi-c/c_typecheck_initializer.cpp b/src/ansi-c/c_typecheck_initializer.cpp index a1af1242dc2..98f5e4ce5a5 100644 --- a/src/ansi-c/c_typecheck_initializer.cpp +++ b/src/ansi-c/c_typecheck_initializer.cpp @@ -23,6 +23,8 @@ Author: Daniel Kroening, kroening@kroening.com #include "c_typecheck_base.h" #include "type2name.h" +#include + void c_typecheck_baset::do_initializer( exprt &initializer, const typet &type, diff --git a/src/ansi-c/c_typecheck_type.cpp b/src/ansi-c/c_typecheck_type.cpp index 26bf7d194f0..e030dcb013e 100644 --- a/src/ansi-c/c_typecheck_type.cpp +++ b/src/ansi-c/c_typecheck_type.cpp @@ -11,6 +11,7 @@ Author: Daniel Kroening, kroening@kroening.com #include "c_typecheck_base.h" +#include #include #include diff --git a/src/cpp/cpp_instantiate_template.cpp b/src/cpp/cpp_instantiate_template.cpp index d133283b1c0..5f7fd1e3ccb 100644 --- a/src/cpp/cpp_instantiate_template.cpp +++ b/src/cpp/cpp_instantiate_template.cpp @@ -15,6 +15,8 @@ Author: Daniel Kroening, kroening@cs.cmu.edu #include #endif +#include + #include #include diff --git a/src/cpp/cpp_typecheck.cpp b/src/cpp/cpp_typecheck.cpp index 7687c1303ac..43a770cdd12 100644 --- a/src/cpp/cpp_typecheck.cpp +++ b/src/cpp/cpp_typecheck.cpp @@ -12,6 +12,7 @@ Author: Daniel Kroening, kroening@cs.cmu.edu #include "cpp_typecheck.h" #include +#include #include #include diff --git a/src/cpp/cpp_typecheck_code.cpp b/src/cpp/cpp_typecheck_code.cpp index 15e4e32a0e2..2db1298acbe 100644 --- a/src/cpp/cpp_typecheck_code.cpp +++ b/src/cpp/cpp_typecheck_code.cpp @@ -21,6 +21,8 @@ Author: Daniel Kroening, kroening@cs.cmu.edu #include "cpp_typecheck_fargs.h" #include "cpp_util.h" +#include + void cpp_typecheckt::typecheck_code(codet &code) { const irep_idt &statement=code.get_statement(); diff --git a/src/cpp/cpp_typecheck_compound_type.cpp b/src/cpp/cpp_typecheck_compound_type.cpp index 193f1515dfc..c39d0c0422a 100644 --- a/src/cpp/cpp_typecheck_compound_type.cpp +++ b/src/cpp/cpp_typecheck_compound_type.cpp @@ -16,6 +16,7 @@ Author: Daniel Kroening, kroening@cs.cmu.edu #endif #include +#include #include #include diff --git a/src/cpp/cpp_typecheck_constructor.cpp b/src/cpp/cpp_typecheck_constructor.cpp index 2879af7662c..b9b8a0fcba8 100644 --- a/src/cpp/cpp_typecheck_constructor.cpp +++ b/src/cpp/cpp_typecheck_constructor.cpp @@ -18,6 +18,8 @@ Author: Daniel Kroening, kroening@cs.cmu.edu #include #include +#include + /// Generate code to copy the parent. /// \param source_location: location for generated code /// \param parent_base_name: base name of typechecked parent diff --git a/src/cpp/cpp_typecheck_conversions.cpp b/src/cpp/cpp_typecheck_conversions.cpp index 607f02ee78b..7157c859e44 100644 --- a/src/cpp/cpp_typecheck_conversions.cpp +++ b/src/cpp/cpp_typecheck_conversions.cpp @@ -23,6 +23,8 @@ Module: C++ Language Type Checking #include "cpp_util.h" +#include + /// Lvalue-to-rvalue conversion /// /// An lvalue (3.10) of a non-function, non-array type T can be diff --git a/src/cpp/cpp_typecheck_expr.cpp b/src/cpp/cpp_typecheck_expr.cpp index 10d112a0508..22b6d620369 100644 --- a/src/cpp/cpp_typecheck_expr.cpp +++ b/src/cpp/cpp_typecheck_expr.cpp @@ -15,6 +15,8 @@ Author: Daniel Kroening, kroening@cs.cmu.edu #include #endif +#include + #include #include #include diff --git a/src/cpp/cpp_typecheck_resolve.cpp b/src/cpp/cpp_typecheck_resolve.cpp index de26dd0dc78..8286c2a53e5 100644 --- a/src/cpp/cpp_typecheck_resolve.cpp +++ b/src/cpp/cpp_typecheck_resolve.cpp @@ -16,6 +16,7 @@ Author: Daniel Kroening, kroening@cs.cmu.edu #endif #include +#include #include #include diff --git a/src/cpp/cpp_typecheck_template.cpp b/src/cpp/cpp_typecheck_template.cpp index c454a649920..cb9e3092e66 100644 --- a/src/cpp/cpp_typecheck_template.cpp +++ b/src/cpp/cpp_typecheck_template.cpp @@ -20,6 +20,8 @@ Author: Daniel Kroening, kroening@cs.cmu.edu #include "cpp_convert_type.h" #include "cpp_template_args.h" +#include + void cpp_typecheckt::salvage_default_arguments( const template_typet &old_type, template_typet &new_type) diff --git a/src/cpp/cpp_typecheck_type.cpp b/src/cpp/cpp_typecheck_type.cpp index 83bd51f609f..6b322961d1f 100644 --- a/src/cpp/cpp_typecheck_type.cpp +++ b/src/cpp/cpp_typecheck_type.cpp @@ -20,6 +20,8 @@ Author: Daniel Kroening, kroening@cs.cmu.edu #include "cpp_convert_type.h" #include "cpp_typecheck_fargs.h" +#include + void cpp_typecheckt::typecheck_type(typet &type) { assert(!type.id().empty()); diff --git a/src/cpp/parse.cpp b/src/cpp/parse.cpp index f6728ed6763..828f055a767 100644 --- a/src/cpp/parse.cpp +++ b/src/cpp/parse.cpp @@ -11,6 +11,7 @@ Author: Daniel Kroening, kroening@cs.cmu.edu #include "cpp_parser.h" +#include #include #include diff --git a/src/goto-diff/change_impact.cpp b/src/goto-diff/change_impact.cpp index cdf9eb7f1c8..fca401fffef 100644 --- a/src/goto-diff/change_impact.cpp +++ b/src/goto-diff/change_impact.cpp @@ -13,6 +13,7 @@ Date: April 2016 #include "change_impact.h" +#include #include #include diff --git a/src/goto-instrument/goto_program2code.cpp b/src/goto-instrument/goto_program2code.cpp index 2bd751e2480..f625f33a947 100644 --- a/src/goto-instrument/goto_program2code.cpp +++ b/src/goto-instrument/goto_program2code.cpp @@ -11,6 +11,7 @@ Author: Daniel Kroening, kroening@kroening.com #include "goto_program2code.h" +#include #include #include diff --git a/src/goto-instrument/k_induction.cpp b/src/goto-instrument/k_induction.cpp index 5ed91b4317e..1166a702735 100644 --- a/src/goto-instrument/k_induction.cpp +++ b/src/goto-instrument/k_induction.cpp @@ -20,6 +20,8 @@ Author: Daniel Kroening, kroening@kroening.com #include "loop_utils.h" #include "unwind.h" +#include + class k_inductiont { public: diff --git a/src/goto-instrument/unwind.cpp b/src/goto-instrument/unwind.cpp index dcfca5417d6..8ac172b553c 100644 --- a/src/goto-instrument/unwind.cpp +++ b/src/goto-instrument/unwind.cpp @@ -16,6 +16,8 @@ Author: Daniel Kroening, kroening@kroening.com #include #endif +#include + #include #include diff --git a/src/goto-instrument/wmm/cycle_collection.cpp b/src/goto-instrument/wmm/cycle_collection.cpp index a36ac99b851..421b6b6758f 100644 --- a/src/goto-instrument/wmm/cycle_collection.cpp +++ b/src/goto-instrument/wmm/cycle_collection.cpp @@ -15,6 +15,8 @@ Date: 2012 #include +#include + /// after the collection, eliminates the executions forbidden by an indirect /// thin-air void event_grapht::graph_explorert::filter_thin_air( diff --git a/src/goto-instrument/wmm/event_graph.cpp b/src/goto-instrument/wmm/event_graph.cpp index 95e2a3712ba..4142d1a3dc6 100644 --- a/src/goto-instrument/wmm/event_graph.cpp +++ b/src/goto-instrument/wmm/event_graph.cpp @@ -15,6 +15,7 @@ Date: 2012 #include +#include #include diff --git a/src/goto-instrument/wmm/goto2graph.cpp b/src/goto-instrument/wmm/goto2graph.cpp index 19e941cf308..4534e115efb 100644 --- a/src/goto-instrument/wmm/goto2graph.cpp +++ b/src/goto-instrument/wmm/goto2graph.cpp @@ -13,6 +13,7 @@ Date: 2012 #include "goto2graph.h" +#include #include #include #include From 1828a14508d63fe6071a1579c8b90b8ba0773e76 Mon Sep 17 00:00:00 2001 From: Michael Tautschnig Date: Wed, 23 Mar 2022 23:37:21 +0000 Subject: [PATCH 2/2] Reorder includes as per clang-format rules --- src/ansi-c/c_typecheck_expr.cpp | 9 ++++----- src/ansi-c/c_typecheck_type.cpp | 13 ++++++------- src/cpp/cpp_instantiate_template.cpp | 4 ++-- src/cpp/cpp_typecheck.cpp | 6 +++--- src/cpp/cpp_typecheck_code.cpp | 3 +-- src/cpp/cpp_typecheck_compound_type.cpp | 8 ++++---- src/cpp/cpp_typecheck_constructor.cpp | 8 ++++---- src/cpp/cpp_typecheck_conversions.cpp | 3 +-- src/cpp/cpp_typecheck_expr.cpp | 4 ++-- src/cpp/cpp_typecheck_resolve.cpp | 6 +++--- src/cpp/cpp_typecheck_template.cpp | 9 ++++----- src/cpp/cpp_typecheck_type.cpp | 7 +++---- src/cpp/parse.cpp | 13 ++++++------- src/goto-diff/change_impact.cpp | 6 +++--- src/goto-instrument/goto_program2code.cpp | 6 +++--- src/goto-instrument/k_induction.cpp | 6 +++--- src/goto-instrument/unwind.cpp | 4 ++-- src/goto-instrument/wmm/cycle_collection.cpp | 4 ++-- src/goto-instrument/wmm/goto2graph.cpp | 13 ++++++------- 19 files changed, 62 insertions(+), 70 deletions(-) diff --git a/src/ansi-c/c_typecheck_expr.cpp b/src/ansi-c/c_typecheck_expr.cpp index 5626c9f2379..5f1ff633ed2 100644 --- a/src/ansi-c/c_typecheck_expr.cpp +++ b/src/ansi-c/c_typecheck_expr.cpp @@ -9,11 +9,6 @@ Author: Daniel Kroening, kroening@kroening.com /// \file /// ANSI-C Language Type Checking -#include "c_typecheck_base.h" - -#include -#include - #include #include #include @@ -40,10 +35,14 @@ Author: Daniel Kroening, kroening@kroening.com #include "builtin_factory.h" #include "c_expr.h" #include "c_qualifiers.h" +#include "c_typecheck_base.h" #include "expr2c.h" #include "padding.h" #include "type2name.h" +#include +#include + void c_typecheck_baset::typecheck_expr(exprt &expr) { if(expr.id()==ID_already_typechecked) diff --git a/src/ansi-c/c_typecheck_type.cpp b/src/ansi-c/c_typecheck_type.cpp index e030dcb013e..90b5a84040c 100644 --- a/src/ansi-c/c_typecheck_type.cpp +++ b/src/ansi-c/c_typecheck_type.cpp @@ -9,13 +9,6 @@ Author: Daniel Kroening, kroening@kroening.com /// \file /// C++ Language Type Checking -#include "c_typecheck_base.h" - -#include -#include - -#include - #include #include #include @@ -25,14 +18,20 @@ Author: Daniel Kroening, kroening@kroening.com #include #include +#include + #include "ansi_c_convert_type.h" #include "ansi_c_declaration.h" #include "c_qualifiers.h" +#include "c_typecheck_base.h" #include "gcc_types.h" #include "padding.h" #include "type2name.h" #include "typedef_type.h" +#include +#include + void c_typecheck_baset::typecheck_type(typet &type) { // we first convert, and then check diff --git a/src/cpp/cpp_instantiate_template.cpp b/src/cpp/cpp_instantiate_template.cpp index 5f7fd1e3ccb..99369d9879d 100644 --- a/src/cpp/cpp_instantiate_template.cpp +++ b/src/cpp/cpp_instantiate_template.cpp @@ -15,13 +15,13 @@ Author: Daniel Kroening, kroening@cs.cmu.edu #include #endif -#include - #include #include #include "cpp_type2name.h" +#include + std::string cpp_typecheckt::template_suffix( const cpp_template_args_tct &template_args) { diff --git a/src/cpp/cpp_typecheck.cpp b/src/cpp/cpp_typecheck.cpp index 43a770cdd12..e697ed82eae 100644 --- a/src/cpp/cpp_typecheck.cpp +++ b/src/cpp/cpp_typecheck.cpp @@ -11,9 +11,6 @@ Author: Daniel Kroening, kroening@cs.cmu.edu #include "cpp_typecheck.h" -#include -#include - #include #include #include @@ -24,6 +21,9 @@ Author: Daniel Kroening, kroening@cs.cmu.edu #include "cpp_util.h" #include "expr2cpp.h" +#include +#include + void cpp_typecheckt::convert(cpp_itemt &item) { if(item.is_declaration()) diff --git a/src/cpp/cpp_typecheck_code.cpp b/src/cpp/cpp_typecheck_code.cpp index 2db1298acbe..d43aa0f3998 100644 --- a/src/cpp/cpp_typecheck_code.cpp +++ b/src/cpp/cpp_typecheck_code.cpp @@ -9,8 +9,6 @@ Author: Daniel Kroening, kroening@cs.cmu.edu /// \file /// C++ Language Type Checking -#include "cpp_typecheck.h" - #include #include #include @@ -18,6 +16,7 @@ Author: Daniel Kroening, kroening@cs.cmu.edu #include "cpp_declarator_converter.h" #include "cpp_exception_id.h" +#include "cpp_typecheck.h" #include "cpp_typecheck_fargs.h" #include "cpp_util.h" diff --git a/src/cpp/cpp_typecheck_compound_type.cpp b/src/cpp/cpp_typecheck_compound_type.cpp index c39d0c0422a..c450f223b57 100644 --- a/src/cpp/cpp_typecheck_compound_type.cpp +++ b/src/cpp/cpp_typecheck_compound_type.cpp @@ -15,12 +15,9 @@ Author: Daniel Kroening, kroening@cs.cmu.edu #include #endif -#include -#include - #include -#include #include +#include #include @@ -29,6 +26,9 @@ Author: Daniel Kroening, kroening@cs.cmu.edu #include "cpp_type2name.h" #include "cpp_util.h" +#include +#include + bool cpp_typecheckt::has_const(const typet &type) { if(type.id()==ID_const) diff --git a/src/cpp/cpp_typecheck_constructor.cpp b/src/cpp/cpp_typecheck_constructor.cpp index b9b8a0fcba8..056fa4e64db 100644 --- a/src/cpp/cpp_typecheck_constructor.cpp +++ b/src/cpp/cpp_typecheck_constructor.cpp @@ -9,15 +9,15 @@ Author: Daniel Kroening, kroening@cs.cmu.edu /// \file /// C++ Language Type Checking -#include "cpp_typecheck.h" - -#include - #include #include #include #include +#include + +#include "cpp_typecheck.h" + #include /// Generate code to copy the parent. diff --git a/src/cpp/cpp_typecheck_conversions.cpp b/src/cpp/cpp_typecheck_conversions.cpp index 7157c859e44..5805b4eb525 100644 --- a/src/cpp/cpp_typecheck_conversions.cpp +++ b/src/cpp/cpp_typecheck_conversions.cpp @@ -9,8 +9,6 @@ Module: C++ Language Type Checking /// \file /// C++ Language Type Checking -#include "cpp_typecheck.h" - #include #include #include @@ -21,6 +19,7 @@ Module: C++ Language Type Checking #include +#include "cpp_typecheck.h" #include "cpp_util.h" #include diff --git a/src/cpp/cpp_typecheck_expr.cpp b/src/cpp/cpp_typecheck_expr.cpp index 22b6d620369..52c46ad5c71 100644 --- a/src/cpp/cpp_typecheck_expr.cpp +++ b/src/cpp/cpp_typecheck_expr.cpp @@ -15,8 +15,6 @@ Author: Daniel Kroening, kroening@cs.cmu.edu #include #endif -#include - #include #include #include @@ -33,6 +31,8 @@ Author: Daniel Kroening, kroening@cs.cmu.edu #include "cpp_util.h" #include "expr2cpp.h" +#include + bool cpp_typecheckt::find_parent( const symbolt &symb, const irep_idt &base_name, diff --git a/src/cpp/cpp_typecheck_resolve.cpp b/src/cpp/cpp_typecheck_resolve.cpp index 8286c2a53e5..cff8508a18e 100644 --- a/src/cpp/cpp_typecheck_resolve.cpp +++ b/src/cpp/cpp_typecheck_resolve.cpp @@ -15,9 +15,6 @@ Author: Daniel Kroening, kroening@cs.cmu.edu #include #endif -#include -#include - #include #include #include @@ -35,6 +32,9 @@ Author: Daniel Kroening, kroening@cs.cmu.edu #include "cpp_typecheck_fargs.h" #include "cpp_util.h" +#include +#include + cpp_typecheck_resolvet::cpp_typecheck_resolvet(cpp_typecheckt &_cpp_typecheck): cpp_typecheck(_cpp_typecheck), original_scope(nullptr) // set in resolve_scope() diff --git a/src/cpp/cpp_typecheck_template.cpp b/src/cpp/cpp_typecheck_template.cpp index cb9e3092e66..9b0417d8a91 100644 --- a/src/cpp/cpp_typecheck_template.cpp +++ b/src/cpp/cpp_typecheck_template.cpp @@ -9,16 +9,15 @@ Author: Daniel Kroening, kroening@cs.cmu.edu /// \file /// C++ Language Type Checking -#include "cpp_typecheck.h" - #include #include -#include "cpp_type2name.h" -#include "cpp_declarator_converter.h" -#include "cpp_template_type.h" #include "cpp_convert_type.h" +#include "cpp_declarator_converter.h" #include "cpp_template_args.h" +#include "cpp_template_type.h" +#include "cpp_type2name.h" +#include "cpp_typecheck.h" #include diff --git a/src/cpp/cpp_typecheck_type.cpp b/src/cpp/cpp_typecheck_type.cpp index 6b322961d1f..b39f2be0236 100644 --- a/src/cpp/cpp_typecheck_type.cpp +++ b/src/cpp/cpp_typecheck_type.cpp @@ -9,15 +9,14 @@ Author: Daniel Kroening, kroening@cs.cmu.edu /// \file /// C++ Language Type Checking -#include "cpp_typecheck.h" - -#include -#include #include +#include +#include #include #include "cpp_convert_type.h" +#include "cpp_typecheck.h" #include "cpp_typecheck_fargs.h" #include diff --git a/src/cpp/parse.cpp b/src/cpp/parse.cpp index 828f055a767..a7770dfc794 100644 --- a/src/cpp/parse.cpp +++ b/src/cpp/parse.cpp @@ -9,20 +9,19 @@ Author: Daniel Kroening, kroening@cs.cmu.edu /// \file /// C++ Language Parsing -#include "cpp_parser.h" - -#include -#include - #include #include #include #include -#include "cpp_token_buffer.h" -#include "cpp_member_spec.h" #include "cpp_enum_type.h" +#include "cpp_member_spec.h" +#include "cpp_parser.h" +#include "cpp_token_buffer.h" + +#include +#include #ifdef DEBUG #include diff --git a/src/goto-diff/change_impact.cpp b/src/goto-diff/change_impact.cpp index fca401fffef..8b9e38d4c1a 100644 --- a/src/goto-diff/change_impact.cpp +++ b/src/goto-diff/change_impact.cpp @@ -13,15 +13,15 @@ Date: April 2016 #include "change_impact.h" -#include -#include - #include #include #include "unified_diff.h" +#include +#include + #if 0 struct cfg_nodet { diff --git a/src/goto-instrument/goto_program2code.cpp b/src/goto-instrument/goto_program2code.cpp index f625f33a947..6681f2f8c57 100644 --- a/src/goto-instrument/goto_program2code.cpp +++ b/src/goto-instrument/goto_program2code.cpp @@ -11,9 +11,6 @@ Author: Daniel Kroening, kroening@kroening.com #include "goto_program2code.h" -#include -#include - #include #include #include @@ -22,6 +19,9 @@ Author: Daniel Kroening, kroening@kroening.com #include #include +#include +#include + void goto_program2codet::operator()() { // labels stored for cleanup diff --git a/src/goto-instrument/k_induction.cpp b/src/goto-instrument/k_induction.cpp index 1166a702735..fae1ab4be8c 100644 --- a/src/goto-instrument/k_induction.cpp +++ b/src/goto-instrument/k_induction.cpp @@ -11,11 +11,11 @@ Author: Daniel Kroening, kroening@kroening.com #include "k_induction.h" -#include -#include - #include +#include +#include + #include "havoc_utils.h" #include "loop_utils.h" #include "unwind.h" diff --git a/src/goto-instrument/unwind.cpp b/src/goto-instrument/unwind.cpp index 8ac172b553c..4fd02f1e609 100644 --- a/src/goto-instrument/unwind.cpp +++ b/src/goto-instrument/unwind.cpp @@ -16,8 +16,6 @@ Author: Daniel Kroening, kroening@kroening.com #include #endif -#include - #include #include @@ -25,6 +23,8 @@ Author: Daniel Kroening, kroening@kroening.com #include "unwindset.h" +#include + void goto_unwindt::copy_segment( const goto_programt::const_targett start, const goto_programt::const_targett end, // exclusive diff --git a/src/goto-instrument/wmm/cycle_collection.cpp b/src/goto-instrument/wmm/cycle_collection.cpp index 421b6b6758f..1ace99775b2 100644 --- a/src/goto-instrument/wmm/cycle_collection.cpp +++ b/src/goto-instrument/wmm/cycle_collection.cpp @@ -11,10 +11,10 @@ Date: 2012 /// \file /// collection of cycles in graph of abstract events -#include "event_graph.h" - #include +#include "event_graph.h" + #include /// after the collection, eliminates the executions forbidden by an indirect diff --git a/src/goto-instrument/wmm/goto2graph.cpp b/src/goto-instrument/wmm/goto2graph.cpp index 4534e115efb..b08e03d361e 100644 --- a/src/goto-instrument/wmm/goto2graph.cpp +++ b/src/goto-instrument/wmm/goto2graph.cpp @@ -13,20 +13,19 @@ Date: 2012 #include "goto2graph.h" -#include -#include -#include -#include - #include #include -#include - #include +#include #include "fence.h" +#include +#include +#include +#include + // #define PRINT_UNSAFES