[PPL-devel] [GIT] ppl/ppl(master): Corrected several header inclusions.
Roberto Bagnara
roberto.bagnara at bugseng.com
Wed Dec 24 12:10:20 CET 2014
Module: ppl/ppl
Branch: master
Commit: bde8814132c937849986d838c3a0b83e46f5f3d6
URL: http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=bde8814132c937849986d838c3a0b83e46f5f3d6
Author: Roberto Bagnara <roberto.bagnara at bugseng.com>
Date: Wed Dec 24 12:10:06 2014 +0100
Corrected several header inclusions.
Fixes violations of rule UCGP1.F1 detected by ECLAIR.
---
demos/ppl_lpsol/dummy.cc | 4 +++-
demos/ppl_lpsol/ppl_lpsol.c | 2 +-
src/BDS_Status.cc | 2 ++
src/Box_Status.cc | 2 ++
src/Floating_Point_Expression_defs.hh | 2 +-
src/Interval_defs.hh | 2 +-
src/MIP_Problem.cc | 12 ++++++------
src/NNC_Polyhedron_defs.hh | 2 +-
src/OR_Matrix_defs.hh | 2 +-
src/Og_Status.cc | 2 ++
10 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/demos/ppl_lpsol/dummy.cc b/demos/ppl_lpsol/dummy.cc
index 77ed707..9ee2793 100644
--- a/demos/ppl_lpsol/dummy.cc
+++ b/demos/ppl_lpsol/dummy.cc
@@ -10,4 +10,6 @@ WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. */
-// This file intentionally contains only this comment :-)
+// This file intentionally contains only the following inclusion.
+#include "ppl-config.h"
+
diff --git a/demos/ppl_lpsol/ppl_lpsol.c b/demos/ppl_lpsol/ppl_lpsol.c
index 52d1cce..e5ce611 100644
--- a/demos/ppl_lpsol/ppl_lpsol.c
+++ b/demos/ppl_lpsol/ppl_lpsol.c
@@ -22,7 +22,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
For the most up-to-date information see the Parma Polyhedra Library
site: http://bugseng.com/products/ppl/ . */
-#include <ppl-config.h>
+#include "ppl-config.h"
#include "ppl_c.h"
#include <gmp.h>
#include <stdio.h>
diff --git a/src/BDS_Status.cc b/src/BDS_Status.cc
index 81e979e..0e67012 100644
--- a/src/BDS_Status.cc
+++ b/src/BDS_Status.cc
@@ -21,6 +21,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
For the most up-to-date information see the Parma Polyhedra Library
site: http://bugseng.com/products/ppl/ . */
+#include "ppl-config.h"
+
namespace Parma_Polyhedra_Library {
namespace Implementation {
diff --git a/src/Box_Status.cc b/src/Box_Status.cc
index b12709d..222ee41 100644
--- a/src/Box_Status.cc
+++ b/src/Box_Status.cc
@@ -21,6 +21,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
For the most up-to-date information see the Parma Polyhedra Library
site: http://bugseng.com/products/ppl/ . */
+#include "ppl-config.h"
+
namespace Parma_Polyhedra_Library {
namespace Implementation {
diff --git a/src/Floating_Point_Expression_defs.hh b/src/Floating_Point_Expression_defs.hh
index a69dc87..38d3cbd 100644
--- a/src/Floating_Point_Expression_defs.hh
+++ b/src/Floating_Point_Expression_defs.hh
@@ -24,8 +24,8 @@ site: http://bugseng.com/products/ppl/ . */
#ifndef PPL_Floating_Point_Expression_defs_hh
#define PPL_Floating_Point_Expression_defs_hh 1
-#include "globals_defs.hh"
#include "Floating_Point_Expression_types.hh"
+#include "globals_defs.hh"
#include "Linear_Form_types.hh"
#include "Box_types.hh"
#include <cmath>
diff --git a/src/Interval_defs.hh b/src/Interval_defs.hh
index 52385d1..376a5f3 100644
--- a/src/Interval_defs.hh
+++ b/src/Interval_defs.hh
@@ -24,11 +24,11 @@ site: http://bugseng.com/products/ppl/ . */
#ifndef PPL_Interval_defs_hh
#define PPL_Interval_defs_hh 1
+#include "Interval_types.hh"
#include "globals_defs.hh"
#include "meta_programming.hh"
#include "assign_or_swap.hh"
#include "intervals_defs.hh"
-#include "Interval_types.hh"
#include "Interval_Info_defs.hh"
#include <iosfwd>
diff --git a/src/MIP_Problem.cc b/src/MIP_Problem.cc
index 1ca83d6..38e97d7 100644
--- a/src/MIP_Problem.cc
+++ b/src/MIP_Problem.cc
@@ -34,12 +34,6 @@ site: http://bugseng.com/products/ppl/ . */
#include "Scalar_Products_inlines.hh"
#include "math_utilities_defs.hh"
-#include <stdexcept>
-#include <deque>
-#include <vector>
-#include <algorithm>
-#include <cmath>
-
// TODO: Remove this when the sparse working cost has been tested enough.
#if PPL_USE_SPARSE_MATRIX
@@ -58,6 +52,12 @@ site: http://bugseng.com/products/ppl/ . */
#define PPL_SIMPLEX_USE_MIP_HEURISTIC 1
#endif
+#include <stdexcept>
+#include <deque>
+#include <vector>
+#include <algorithm>
+#include <cmath>
+
#if PPL_NOISY_SIMPLEX
#include <iostream>
#endif
diff --git a/src/NNC_Polyhedron_defs.hh b/src/NNC_Polyhedron_defs.hh
index 962d201..1dbfb76 100644
--- a/src/NNC_Polyhedron_defs.hh
+++ b/src/NNC_Polyhedron_defs.hh
@@ -24,8 +24,8 @@ site: http://bugseng.com/products/ppl/ . */
#ifndef PPL_NNC_Polyhedron_defs_hh
#define PPL_NNC_Polyhedron_defs_hh 1
-#include "C_Polyhedron_types.hh"
#include "NNC_Polyhedron_types.hh"
+#include "C_Polyhedron_types.hh"
#include "Polyhedron_defs.hh"
#include "Grid_types.hh"
diff --git a/src/OR_Matrix_defs.hh b/src/OR_Matrix_defs.hh
index 9ee49d3..8a12b3d 100644
--- a/src/OR_Matrix_defs.hh
+++ b/src/OR_Matrix_defs.hh
@@ -24,8 +24,8 @@ site: http://bugseng.com/products/ppl/ . */
#ifndef PPL_OR_Matrix_defs_hh
#define PPL_OR_Matrix_defs_hh 1
-#include "globals_defs.hh"
#include "OR_Matrix_types.hh"
+#include "globals_defs.hh"
#include "DB_Row_defs.hh"
#include "Checked_Number_defs.hh"
#include <cstddef>
diff --git a/src/Og_Status.cc b/src/Og_Status.cc
index b5314f6..e79dc05 100644
--- a/src/Og_Status.cc
+++ b/src/Og_Status.cc
@@ -21,6 +21,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1307, USA.
For the most up-to-date information see the Parma Polyhedra Library
site: http://bugseng.com/products/ppl/ . */
+#include "ppl-config.h"
+
namespace Parma_Polyhedra_Library {
namespace Implementation {
More information about the PPL-devel
mailing list