Skip to content

Commit 97f14fb

Browse files
reukreuk
committed
Fix include order in solvers
1 parent 1bf245a commit 97f14fb

File tree

101 files changed

+118
-183
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+118
-183
lines changed

‎src/solvers/cvc/cvc_conv.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Author: Daniel Kroening, kroening@kroening.com
66
77
\*******************************************************************/
88

9+
#include "cvc_conv.h"
910

1011
#include <cassert>
1112
#include <cctype>
@@ -21,8 +22,6 @@ Author: Daniel Kroening, kroening@kroening.com
2122

2223
#include <ansi-c/string_constant.h>
2324

24-
#include "cvc_conv.h"
25-
2625
void cvc_convt::print_assignment(std::ostream &out) const
2726
{
2827
// Boolean stuff

‎src/solvers/cvc/cvc_dec.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Author: Daniel Kroening, kroening@kroening.com
66
77
\*******************************************************************/
88

9+
#include "cvc_dec.h"
910

1011
#include <cstring>
1112
#include <cassert>
@@ -28,8 +29,6 @@ Author: Daniel Kroening, kroening@kroening.com
2829
#include <util/prefix.h>
2930
#include <util/string2int.h>
3031

31-
#include "cvc_dec.h"
32-
3332
cvc_temp_filet::cvc_temp_filet()
3433
{
3534
temp_out_filename="cvc_dec_out_"+std::to_string(getpid())+".tmp";

‎src/solvers/cvc/cvc_prop.cpp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,11 @@ Author: Daniel Kroening, kroening@kroening.com
66
77
\*******************************************************************/
88

9+
#include "cvc_prop.h"
910

1011
#include <cassert>
1112
#include <set>
1213

13-
14-
#include "cvc_prop.h"
15-
1614
explicit cvc_propt::cvc_propt(std::ostream &_out):out(_out)
1715
{
1816
_no_variables=0;

‎src/solvers/dplib/dplib_conv.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Author: Daniel Kroening, kroening@kroening.com
66
77
\*******************************************************************/
88

9+
#include "dplib_conv.h"
910

1011
#include <cassert>
1112
#include <cctype>
@@ -20,8 +21,6 @@ Author: Daniel Kroening, kroening@kroening.com
2021

2122
#include <ansi-c/string_constant.h>
2223

23-
#include "dplib_conv.h"
24-
2524
std::string dplib_convt::bin_zero(unsigned bits)
2625
{
2726
assert(bits!=0);

‎src/solvers/dplib/dplib_dec.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Author: Daniel Kroening, kroening@kroening.com
66
77
\*******************************************************************/
88

9+
#include "dplib_dec.h"
910

1011
#include <cstring>
1112
#include <cassert>
@@ -27,8 +28,6 @@ Author: Daniel Kroening, kroening@kroening.com
2728
#include <util/prefix.h>
2829
#include <util/string2int.h>
2930

30-
#include "dplib_dec.h"
31-
3231
dplib_temp_filet::dplib_temp_filet()
3332
{
3433
temp_out_filename="dplib_dec_out_"+std::to_string(getpid())+".tmp";

‎src/solvers/dplib/dplib_prop.cpp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,12 @@ Author: Daniel Kroening, kroening@kroening.com
66
77
\*******************************************************************/
88

9+
#include "dplib_prop.h"
910

1011
#include <cassert>
1112

1213
#include <set>
1314

14-
15-
#include "dplib_prop.h"
16-
1715
dplib_propt::dplib_propt(std::ostream &_out):out(_out)
1816
{
1917
// we skip index 0

‎src/solvers/flattening/arrays.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Author: Daniel Kroening, kroening@kroening.com
66
77
\*******************************************************************/
88

9+
#include "arrays.h"
910

1011
#include <cassert>
1112
#include <iostream>
@@ -20,8 +21,6 @@ Author: Daniel Kroening, kroening@kroening.com
2021

2122
#include <solvers/prop/prop.h>
2223

23-
#include "arrays.h"
24-
2524
arrayst::arrayst(
2625
const namespacet &_ns,
2726
propt &_prop):equalityt(_ns, _prop)

‎src/solvers/flattening/boolbv.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Author: Daniel Kroening, kroening@kroening.com
66
77
\*******************************************************************/
88

9+
#include "boolbv.h"
910

1011
#include <cassert>
1112
#include <map>
@@ -23,7 +24,6 @@ Author: Daniel Kroening, kroening@kroening.com
2324

2425
#include <ansi-c/string_constant.h>
2526

26-
#include "boolbv.h"
2727
#include "boolbv_type.h"
2828

2929
#include "../floatbv/float_utils.h"

‎src/solvers/flattening/boolbv_abs.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ Author: Daniel Kroening, kroening@kroening.com
66
77
\*******************************************************************/
88

9+
#include "boolbv.h"
910

1011
#include <util/std_types.h>
1112

12-
#include "boolbv.h"
1313
#include "boolbv_type.h"
1414

1515
#include "../floatbv/float_utils.h"

‎src/solvers/flattening/boolbv_add_sub.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@ Author: Daniel Kroening, kroening@kroening.com
66
77
\*******************************************************************/
88

9+
#include "boolbv.h"
910

1011
#include <iostream>
1112

1213
#include <util/std_types.h>
1314

14-
#include "boolbv.h"
15-
1615
#include "../floatbv/float_utils.h"
1716

1817
bvt boolbvt::convert_add_sub(const exprt &expr)

0 commit comments

Comments
 (0)