diff -wu ppl-0.10.2/src/C_Polyhedron.defs.hh ppl-0.10.2-patch/src/C_Polyhedron.defs.hh
--- ppl-0.10.2/src/C_Polyhedron.defs.hh 2009-04-17 23:03:19.000000000 -0600
+++ ppl-0.10.2-patch/src/C_Polyhedron.defs.hh 2009-09-16 14:03:21.000000000 -0600
@@ -55,7 +55,7 @@
the precise topological closure test will be performed.
*/
-class Parma_Polyhedra_Library::C_Polyhedron : public Polyhedron {
+class Parma_Polyhedra_Library::C_Polyhedron : public Parma_Polyhedra_Library::Polyhedron {
public:
//! Builds either the universe or the empty C polyhedron.
/*!
diff -wu ppl-0.10.2/src/Congruence.defs.hh ppl-0.10.2-patch/src/Congruence.defs.hh
--- ppl-0.10.2/src/Congruence.defs.hh 2009-04-17 23:03:19.000000000 -0600
+++ ppl-0.10.2-patch/src/Congruence.defs.hh 2009-09-16 13:58:55.000000000 -0600
@@ -207,7 +207,7 @@
syntactically different from the (semantically equivalent)
congruence considered.
*/
-class Parma_Polyhedra_Library::Congruence : private Row {
+class Parma_Polyhedra_Library::Congruence : private Parma_Polyhedra_Library::Row {
public:
//! Ordinary copy-constructor.
Congruence(const Congruence& cg);
diff -wu ppl-0.10.2/src/Congruence_System.defs.hh ppl-0.10.2-patch/src/Congruence_System.defs.hh
--- ppl-0.10.2/src/Congruence_System.defs.hh 2009-04-17 23:03:19.000000000 -0600
+++ ppl-0.10.2-patch/src/Congruence_System.defs.hh 2009-09-16 13:58:25.000000000 -0600
@@ -117,7 +117,7 @@
reordered, removed (if they are trivial, duplicate or
implied by other congruences), linearly combined, etc.
*/
-class Parma_Polyhedra_Library::Congruence_System : private Matrix {
+class Parma_Polyhedra_Library::Congruence_System : private Parma_Polyhedra_Library::Matrix {
public:
//! Default constructor: builds an empty system of congruences.
Congruence_System();
diff -wu ppl-0.10.2/src/Constraint.defs.hh ppl-0.10.2-patch/src/Constraint.defs.hh
--- ppl-0.10.2/src/Constraint.defs.hh 2009-04-17 23:03:19.000000000 -0600
+++ ppl-0.10.2-patch/src/Constraint.defs.hh 2009-09-16 13:58:03.000000000 -0600
@@ -257,7 +257,7 @@
syntactically different from the (semantically equivalent)
constraint considered.
*/
-class Parma_Polyhedra_Library::Constraint : private Linear_Row {
+class Parma_Polyhedra_Library::Constraint : private Parma_Polyhedra_Library::Linear_Row {
public:
//! Ordinary copy-constructor.
Constraint(const Constraint& c);
diff -wu ppl-0.10.2/src/Constraint_System.defs.hh ppl-0.10.2-patch/src/Constraint_System.defs.hh
--- ppl-0.10.2/src/Constraint_System.defs.hh 2009-04-17 23:03:19.000000000 -0600
+++ ppl-0.10.2-patch/src/Constraint_System.defs.hh 2009-09-16 13:57:21.000000000 -0600
@@ -124,7 +124,7 @@
reordered, removed (if they are trivial, duplicate or
implied by other constraints), linearly combined, etc.
*/
-class Parma_Polyhedra_Library::Constraint_System : private Linear_System {
+class Parma_Polyhedra_Library::Constraint_System : private Parma_Polyhedra_Library::Linear_System {
public:
//! Default constructor: builds an empty system of constraints.
Constraint_System();
diff -wu ppl-0.10.2/src/Generator.defs.hh ppl-0.10.2-patch/src/Generator.defs.hh
--- ppl-0.10.2/src/Generator.defs.hh 2009-04-17 23:03:19.000000000 -0600
+++ ppl-0.10.2-patch/src/Generator.defs.hh 2009-09-16 14:02:25.000000000 -0600
@@ -240,7 +240,7 @@
the notion of coefficient with the notion of coordinate:
these are equivalent only when the divisor of the (closure) point is 1.
*/
-class Parma_Polyhedra_Library::Generator : private Linear_Row {
+class Parma_Polyhedra_Library::Generator : private Parma_Polyhedra_Library::Linear_Row {
public:
//! Returns the line of direction \p e.
/*!
diff -wu ppl-0.10.2/src/Generator_System.defs.hh ppl-0.10.2-patch/src/Generator_System.defs.hh
--- ppl-0.10.2/src/Generator_System.defs.hh 2009-04-17 23:03:19.000000000 -0600
+++ ppl-0.10.2-patch/src/Generator_System.defs.hh 2009-09-16 14:02:08.000000000 -0600
@@ -180,7 +180,7 @@
will be available, where original generators may have been
reordered, removed (if they are duplicate or redundant), etc.
*/
-class Parma_Polyhedra_Library::Generator_System : protected Linear_System {
+class Parma_Polyhedra_Library::Generator_System : protected Parma_Polyhedra_Library::Linear_System {
public:
//! Default constructor: builds an empty system of generators.
Generator_System();
diff -wu ppl-0.10.2/src/Grid_Generator.defs.hh ppl-0.10.2-patch/src/Grid_Generator.defs.hh
--- ppl-0.10.2/src/Grid_Generator.defs.hh 2009-04-17 23:03:19.000000000 -0600
+++ ppl-0.10.2-patch/src/Grid_Generator.defs.hh 2009-09-16 14:02:40.000000000 -0600
@@ -224,7 +224,7 @@
the notion of coefficient with the notion of coordinate:
these are equivalent only when the divisor is 1.
*/
-class Parma_Polyhedra_Library::Grid_Generator : private Generator {
+class Parma_Polyhedra_Library::Grid_Generator : private Parma_Polyhedra_Library::Generator {
public:
//! Returns the line of direction \p e.
/*!
diff -wu ppl-0.10.2/src/Grid_Generator_System.defs.hh ppl-0.10.2-patch/src/Grid_Generator_System.defs.hh
--- ppl-0.10.2/src/Grid_Generator_System.defs.hh 2009-04-17 23:03:19.000000000 -0600
+++ ppl-0.10.2-patch/src/Grid_Generator_System.defs.hh 2009-09-16 14:03:00.000000000 -0600
@@ -175,7 +175,7 @@
reordered, removed (if they are duplicate or redundant), etc.
*/
class Parma_Polyhedra_Library::Grid_Generator_System
- : private Generator_System {
+ : private Parma_Polyhedra_Library::Generator_System {
public:
//! Default constructor: builds an empty system of generators.
Grid_Generator_System();
diff -wu ppl-0.10.2/src/Linear_Expression.defs.hh ppl-0.10.2-patch/src/Linear_Expression.defs.hh
--- ppl-0.10.2/src/Linear_Expression.defs.hh 2009-04-17 23:03:19.000000000 -0600
+++ ppl-0.10.2-patch/src/Linear_Expression.defs.hh 2009-09-16 13:56:08.000000000 -0600
@@ -233,7 +233,7 @@
with space dimension zero and then extended to space dimension 3
in the fifth line.
*/
-class Parma_Polyhedra_Library::Linear_Expression : private Linear_Row {
+class Parma_Polyhedra_Library::Linear_Expression : private Parma_Polyhedra_Library::Linear_Row {
public:
//! Default constructor: returns a copy of Linear_Expression::zero().
Linear_Expression();
diff -wu ppl-0.10.2/src/Linear_Row.defs.hh ppl-0.10.2-patch/src/Linear_Row.defs.hh
--- ppl-0.10.2/src/Linear_Row.defs.hh 2009-04-17 23:03:19.000000000 -0600
+++ ppl-0.10.2-patch/src/Linear_Row.defs.hh 2009-09-16 13:55:44.000000000 -0600
@@ -121,7 +121,7 @@
*/
#endif // defined(PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS)
-class Parma_Polyhedra_Library::Linear_Row : public Row {
+class Parma_Polyhedra_Library::Linear_Row : public Parma_Polyhedra_Library::Row {
public:
//! The possible kinds of Linear_Row objects.
enum Kind {
diff -wu ppl-0.10.2/src/Linear_System.defs.hh ppl-0.10.2-patch/src/Linear_System.defs.hh
--- ppl-0.10.2/src/Linear_System.defs.hh 2009-04-17 23:03:19.000000000 -0600
+++ ppl-0.10.2-patch/src/Linear_System.defs.hh 2009-09-16 13:56:43.000000000 -0600
@@ -51,7 +51,7 @@
*/
#endif // defined(PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS)
-class Parma_Polyhedra_Library::Linear_System : public Matrix {
+class Parma_Polyhedra_Library::Linear_System : public Parma_Polyhedra_Library::Matrix {
public:
//! Builds an empty linear system with specified topology.
/*!
Only in ppl-0.10.2-patch/src/: Makefile
diff -wu ppl-0.10.2/src/Row.defs.hh ppl-0.10.2-patch/src/Row.defs.hh
--- ppl-0.10.2/src/Row.defs.hh 2009-04-17 23:03:19.000000000 -0600
+++ ppl-0.10.2-patch/src/Row.defs.hh 2009-09-16 13:53:55.000000000 -0600
@@ -85,7 +85,7 @@
//! A finite sequence of coefficients.
/*! \ingroup PPL_CXX_interface */
#endif // defined(PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS)
-class Parma_Polyhedra_Library::Row : private Row_Impl_Handler {
+class Parma_Polyhedra_Library::Row : private Parma_Polyhedra_Library::Row_Impl_Handler {
public:
#ifdef PPL_DOXYGEN_INCLUDE_IMPLEMENTATION_DETAILS
/*! \brief
diff -wu ppl-0.10.2/src/Variables_Set.defs.hh ppl-0.10.2-patch/src/Variables_Set.defs.hh
--- ppl-0.10.2/src/Variables_Set.defs.hh 2009-04-17 23:03:19.000000000 -0600
+++ ppl-0.10.2-patch/src/Variables_Set.defs.hh 2009-09-16 14:01:02.000000000 -0600
@@ -44,9 +44,9 @@
//! An std::set of variables' indexes.
class Parma_Polyhedra_Library::Variables_Set
- : public std::set {
+ : public std::set {
private:
- typedef std::set Base;
+ typedef std::set Base;
public:
//! Builds the empty set of variable indexes.
@@ -67,13 +67,13 @@
Variables_Set(const Variable& v, const Variable& w);
//! Returns the maximum space dimension a Variables_Set can handle.
- static dimension_type max_space_dimension();
+ static Parma_Polyhedra_Library::dimension_type max_space_dimension();
/*! \brief
Returns the dimension of the smallest vector space enclosing all
the variables whose indexes are in the set.
*/
- dimension_type space_dimension() const;
+ Parma_Polyhedra_Library::dimension_type space_dimension() const;
//! Inserts the index of variavle \p v into the set.
void insert(Variable v);