[PPL-devel] [GIT] ppl/ppl(ppl-0_11-branch): Avoid using identifier `PS', since Solaris has a macro with that name.

[Roberto Bagnara]

Module: ppl/ppl
Branch: ppl-0_11-branch
Commit: a183a1a076fe6a29767487831c4ae232f5712d6c
URL:    http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=a183a1a076fe6a29767487831c4ae232f5712d6c

Author: Roberto Bagnara <bagnara at cs.unipr.it>
Date:   Sun Dec 19 08:27:57 2010 +0100

Avoid using identifier `PS', since Solaris has a macro with that name.

---

 doc/definitions.dox         |    8 ++++----
 instchk.hh                  |    4 ++--
 tests/Powerset/powerset1.cc |   18 +++++++++---------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/doc/definitions.dox b/doc/definitions.dox
index b94d2e8..fd1ceb4 100644
--- a/doc/definitions.dox
+++ b/doc/definitions.dox
@@ -103,10 +103,10 @@ where:
 Other semantic GDs, the <EM>compound classes</EM>, can be constructed
 (also recursively) from all the GDs classes.
 These include:
-  - \link Parma_Polyhedra_Library::Pointset_Powerset \c Pointset_Powerset\<PS\> \endlink,
+  - \link Parma_Polyhedra_Library::Pointset_Powerset \c Pointset_Powerset\<PSET\> \endlink,
   - \link Parma_Polyhedra_Library::Partially_Reduced_Product <CODE>Partially_Reduced_Product\<D1, D2, R\></CODE> \endlink,
   .
-where \c PS, \c D1 and \c D2 can be any semantic GD classes and \c R is the
+where \c PSET, \c D1 and \c D2 can be any semantic GD classes and \c R is the
 reduction operation to be applied to the component domains of the
 product class.
 
@@ -2689,10 +2689,10 @@ not themselves occur as one of their argument domains.  Therefore their
 use comes with the following warning.
 
 \warning
-The <CODE>Pointset_Powerset<PS></CODE> and
+The <CODE>Pointset_Powerset<PSET></CODE> and
 <CODE>Partially_Reduced_Product<D1, D2, R></CODE>
 should only be used with the following instantiations
-for the disjunct domain template \p PS and component domain
+for the disjunct domain template \p PSET and component domain
 templates \p D1 and \p D2:
 <CODE>C_Polyhedron</CODE>,
 <CODE>NNC_Polyhedron</CODE>,
diff --git a/instchk.hh b/instchk.hh
index 0a07a08..e848172 100644
--- a/instchk.hh
+++ b/instchk.hh
@@ -247,11 +247,11 @@ public:
   }
 };
 
-template <typename PS>
+template <typename PSET>
 class Pointset_Powerset {
 public:
   static bool valid_instantiation() {
-    return PS::valid_Pointset_Powerset_argument();
+    return PSET::valid_Pointset_Powerset_argument();
   }
 };
 
diff --git a/tests/Powerset/powerset1.cc b/tests/Powerset/powerset1.cc
index 09ab286..2c1e3f6 100644
--- a/tests/Powerset/powerset1.cc
+++ b/tests/Powerset/powerset1.cc
@@ -27,14 +27,14 @@ namespace {
 // Uses every public Powerset method.
 bool
 test01() {
-  typedef Powerset<FCAIBVP> PS;
+  typedef Powerset<FCAIBVP> PSET;
 
   Variable A(0);
 
-  PS ps1;
+  PSET ps1;
   ps1.add_disjunct(FCAIBVP(A));
 
-  PS ps2 = ps1;
+  PSET ps2 = ps1;
 
   if (ps2 != ps1 || !(ps2 == ps1))
     return false;
@@ -43,7 +43,7 @@ test01() {
   nout << "ps1:" << endl << ps1 << endl;
 
   FCAIBVP d(A);
-  PS ps3(d);
+  PSET ps3(d);
 
   if (!ps1.definitely_entails(ps3))
     return false;
@@ -67,35 +67,35 @@ test01() {
 
   // Iterator.
   dimension_type count = 0;
-  for (PS::iterator i = ps3.begin(); i != ps3.end(); ++i)
+  for (PSET::iterator i = ps3.begin(); i != ps3.end(); ++i)
     ++count;
   if (count != 1)
     return false;
 
   // Constant iterator.
   count = 0;
-  for (PS::const_iterator i = ps3.begin(); i != ps3.end(); ++i)
+  for (PSET::const_iterator i = ps3.begin(); i != ps3.end(); ++i)
     ++count;
   if (count != 1)
     return false;
 
   // Reverse iterator.
   count = 0;
-  for (PS::reverse_iterator i = ps3.rbegin(); i != ps3.rend(); ++i)
+  for (PSET::reverse_iterator i = ps3.rbegin(); i != ps3.rend(); ++i)
     ++count;
   if (count != 1)
     return false;
 
   // Constant reverse iterator.
   count = 0;
-  for (PS::const_reverse_iterator i = ps3.rbegin(),
+  for (PSET::const_reverse_iterator i = ps3.rbegin(),
 	 ps3_rend = ps3.rend(); i != ps3_rend; ++i)
     ++count;
   if (count != 1)
     return false;
 
   ps2 = ps3;
-  PS ps_empty;
+  PSET ps_empty;
   ps2.drop_disjunct(ps2.begin());
   if (ps2 != ps_empty)
     return false;