Fix relative include paths

peterschrammel · peterschrammel · commit 3180e835d64b · 2018-05-21T17:22:38.000+01:00
diff --git a/src/ansi-c/literals/convert_float_literal.cpp b/src/ansi-c/literals/convert_float_literal.cpp
@@ -21,8 +21,9 @@ Author: Daniel Kroening, kroening@kroening.com
 #include <util/std_types.h>
 #include <util/string2int.h>
 
+#include <ansi-c/gcc_types.h>
+
 #include "parse_float.h"
-#include "../gcc_types.h"
 
 exprt convert_float_literal(const std::string &src)
 {
diff --git a/src/goto-instrument/wmm/goto2graph.cpp b/src/goto-instrument/wmm/goto2graph.cpp
@@ -21,7 +21,8 @@ Date: 2012
 
 #include <linking/static_lifetime_init.h>
 
-#include "../rw_set.h"
+#include <goto-instrument/rw_set.h>
+
 #include "fence.h"
 
 // #define PRINT_UNSAFES
diff --git a/src/goto-instrument/wmm/shared_buffers.cpp b/src/goto-instrument/wmm/shared_buffers.cpp
@@ -12,7 +12,8 @@ Author: Daniel Kroening, kroening@kroening.com
 
 #include <linking/static_lifetime_init.h>
 
-#include "../rw_set.h"
+#include <goto-instrument/rw_set.h>
+
 #include "fence.h"
 
 /// returns a unique id (for fresh variables)
diff --git a/src/goto-instrument/wmm/weak_memory.cpp b/src/goto-instrument/wmm/weak_memory.cpp
@@ -27,7 +27,7 @@ Date: September 2011
 
 #include <linking/static_lifetime_init.h>
 
-#include "../rw_set.h"
+#include <goto-instrument/rw_set.h>
 
 #include "shared_buffers.h"
 #include "goto2graph.h"
diff --git a/src/solvers/flattening/boolbv.cpp b/src/solvers/flattening/boolbv.cpp
@@ -26,8 +26,8 @@ Author: Daniel Kroening, kroening@kroening.com
 
 #include "boolbv_type.h"
 
-#include "../floatbv/float_utils.h"
-#include "../lowering/expr_lowering.h"
+#include <solvers/floatbv/float_utils.h>
+#include <solvers/lowering/expr_lowering.h>
 
 bool boolbvt::literal(
   const exprt &expr,
diff --git a/src/solvers/flattening/boolbv_abs.cpp b/src/solvers/flattening/boolbv_abs.cpp
@@ -12,7 +12,7 @@ Author: Daniel Kroening, kroening@kroening.com
 
 #include "boolbv_type.h"
 
-#include "../floatbv/float_utils.h"
+#include <solvers/floatbv/float_utils.h>
 
 bvt boolbvt::convert_abs(const exprt &expr)
 {
diff --git a/src/solvers/flattening/boolbv_add_sub.cpp b/src/solvers/flattening/boolbv_add_sub.cpp
@@ -11,7 +11,7 @@ Author: Daniel Kroening, kroening@kroening.com
 #include <util/invariant.h>
 #include <util/std_types.h>
 
-#include "../floatbv/float_utils.h"
+#include <solvers/floatbv/float_utils.h>
 
 bvt boolbvt::convert_add_sub(const exprt &expr)
 {
diff --git a/src/solvers/flattening/boolbv_bv_rel.cpp b/src/solvers/flattening/boolbv_bv_rel.cpp
@@ -12,7 +12,7 @@ Author: Daniel Kroening, kroening@kroening.com
 
 #include "boolbv_type.h"
 
-#include "../floatbv/float_utils.h"
+#include <solvers/floatbv/float_utils.h>
 
 literalt boolbvt::convert_bv_rel(const exprt &expr)
 {
diff --git a/src/solvers/flattening/boolbv_floatbv_op.cpp b/src/solvers/flattening/boolbv_floatbv_op.cpp
@@ -13,7 +13,7 @@ Author: Daniel Kroening, kroening@kroening.com
 
 #include <util/std_types.h>
 
-#include "../floatbv/float_utils.h"
+#include <solvers/floatbv/float_utils.h>
 
 bvt boolbvt::convert_floatbv_typecast(const floatbv_typecast_exprt &expr)
 {
diff --git a/src/solvers/flattening/boolbv_ieee_float_rel.cpp b/src/solvers/flattening/boolbv_ieee_float_rel.cpp
@@ -12,7 +12,7 @@ Author: Daniel Kroening, kroening@kroening.com
 
 #include "boolbv_type.h"
 
-#include "../floatbv/float_utils.h"
+#include <solvers/floatbv/float_utils.h>
 
 literalt boolbvt::convert_ieee_float_rel(const exprt &expr)
 {
diff --git a/src/solvers/flattening/boolbv_map.cpp b/src/solvers/flattening/boolbv_map.cpp
@@ -10,7 +10,7 @@ Author: Daniel Kroening, kroening@kroening.com
 
 #include <util/threeval.h>
 
-#include "../prop/prop.h"
+#include <solvers/prop/prop.h>
 
 #include "boolbv_width.h"
 
diff --git a/src/solvers/flattening/boolbv_typecast.cpp b/src/solvers/flattening/boolbv_typecast.cpp
@@ -12,11 +12,11 @@ Author: Daniel Kroening, kroening@kroening.com
 
 #include <util/std_types.h>
 
+#include <solvers/floatbv/float_utils.h>
+
 #include "boolbv_type.h"
 #include "c_bit_field_replacement_type.h"
 
-#include "../floatbv/float_utils.h"
-
 bvt boolbvt::convert_bv_typecast(const typecast_exprt &expr)
 {
   const typet &expr_type=ns.follow(expr.type());
diff --git a/src/solvers/flattening/boolbv_unary_minus.cpp b/src/solvers/flattening/boolbv_unary_minus.cpp
@@ -10,9 +10,9 @@ Author: Daniel Kroening, kroening@kroening.com
 
 #include <util/std_types.h>
 
-#include "boolbv_type.h"
+#include <solvers/floatbv/float_utils.h>
 
-#include "../floatbv/float_utils.h"
+#include "boolbv_type.h"
 
 bvt boolbvt::convert_unary_minus(const unary_exprt &expr)
 {
diff --git a/src/solvers/floatbv/float_bv.h b/src/solvers/floatbv/float_bv.h
@@ -13,7 +13,7 @@ Author: Daniel Kroening, kroening@kroening.com
 #include <util/ieee_float.h>
 #include <util/std_expr.h>
 
-#include "../flattening/bv_utils.h"
+#include <solvers/flattening/bv_utils.h>
 
 class float_bvt
 {
diff --git a/src/solvers/qbf/qdimacs_cnf.h b/src/solvers/qbf/qdimacs_cnf.h
@@ -13,7 +13,7 @@ Author: Daniel Kroening, kroening@kroening.com
 #include <set>
 #include <iosfwd>
 
-#include "../sat/dimacs_cnf.h"
+#include <solvers/sat/dimacs_cnf.h>
 
 class qdimacs_cnft:public dimacs_cnft
 {

Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,9 @@ Author: Daniel Kroening, [email protected]`
`21`	`21`	`#include <util/std_types.h>`
`22`	`22`	`#include <util/string2int.h>`
`23`	`23`
	`24`	`+#include <ansi-c/gcc_types.h>`
	`25`	`+`
`24`	`26`	`#include "parse_float.h"`
`25`		`-#include "../gcc_types.h"`
`26`	`27`
`27`	`28`	`exprt convert_float_literal(const std::string &src)`
`28`	`29`	`{`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ Author: Daniel Kroening, [email protected]`
`12`	`12`
`13`	`13`	`#include "boolbv_type.h"`
`14`	`14`
`15`		`-#include "../floatbv/float_utils.h"`
	`15`	`+#include <solvers/floatbv/float_utils.h>`
`16`	`16`
`17`	`17`	`bvt boolbvt::convert_abs(const exprt &expr)`
`18`	`18`	`{`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ Author: Daniel Kroening, [email protected]`
`11`	`11`	`#include <util/invariant.h>`
`12`	`12`	`#include <util/std_types.h>`
`13`	`13`
`14`		`-#include "../floatbv/float_utils.h"`
	`14`	`+#include <solvers/floatbv/float_utils.h>`
`15`	`15`
`16`	`16`	`bvt boolbvt::convert_add_sub(const exprt &expr)`
`17`	`17`	`{`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ Author: Daniel Kroening, [email protected]`
`13`	`13`
`14`	`14`	`#include <util/std_types.h>`
`15`	`15`
`16`		`-#include "../floatbv/float_utils.h"`
	`16`	`+#include <solvers/floatbv/float_utils.h>`
`17`	`17`
`18`	`18`	`bvt boolbvt::convert_floatbv_typecast(const floatbv_typecast_exprt &expr)`
`19`	`19`	`{`