[Boost-commit] svn:boost r62271 - trunk/boost/graph/distributed

Subject: [Boost-commit] svn:boost r62271 - trunk/boost/graph/distributed
From: jewillco_at_[hidden]
Date: 2010-05-27 13:31:40

Author: jewillco
Date: 2010-05-27 13:31:40 EDT (Thu, 27 May 2010)
New Revision: 62271
URL: http://svn.boost.org/trac/boost/changeset/62271

Log:
Changed "and" to "&&" in #if statements to appease VC++ 10
Text files modified: 
   trunk/boost/graph/distributed/hohberg_biconnected_components.hpp |    16 ++++++++--------                        
   1 files changed, 8 insertions(+), 8 deletions(-)

Modified: trunk/boost/graph/distributed/hohberg_biconnected_components.hpp
==============================================================================
--- trunk/boost/graph/distributed/hohberg_biconnected_components.hpp	(original)
+++ trunk/boost/graph/distributed/hohberg_biconnected_components.hpp	2010-05-27 13:31:40 EDT (Thu, 27 May 2010)
@@ -173,7 +173,7 @@
 #endif
 
     if (a == b) {
-#if defined(PBGL_HOHBERG_DEBUG) and PBGL_HOHBERG_DEBUG > 2
+#if defined(PBGL_HOHBERG_DEBUG) && PBGL_HOHBERG_DEBUG > 2
       std::cerr << local(a) << '@' << owner(a) << std::endl;
 #endif
       return a;
@@ -186,7 +186,7 @@
       if (*last == b) { swap(a,b); break; }
 
       if (last == first) {
-#if defined(PBGL_HOHBERG_DEBUG) and PBGL_HOHBERG_DEBUG > 2
+#if defined(PBGL_HOHBERG_DEBUG) && PBGL_HOHBERG_DEBUG > 2
         std::cerr << local(*first) << '@' << owner(*first) << std::endl;
 #endif
         return *first;
@@ -205,7 +205,7 @@
       else --last;
     }
 
-#if defined(PBGL_HOHBERG_DEBUG) and PBGL_HOHBERG_DEBUG > 2
+#if defined(PBGL_HOHBERG_DEBUG) && PBGL_HOHBERG_DEBUG > 2
     std::cerr << local(*last) << '@' << owner(*last) << std::endl;
 #endif
     // We've found b; it's the infimum.
@@ -715,7 +715,7 @@
     } else if (edata.is_tree_edge) {
       has_more_children_to_name = true;
     }
-#if defined(PBGL_HOHBERG_DEBUG) and PBGL_HOHBERG_DEBUG > 2
+#if defined(PBGL_HOHBERG_DEBUG) && PBGL_HOHBERG_DEBUG > 2
     std::cerr << "M[" << local(source(e, g)) << '@' << owner(source(e, g))
               << " -> " << local(target(e, g)) << '@' << owner(target(e, g))
               << "] = ";
@@ -747,7 +747,7 @@
   if (parent != graph_traits<Graph>::null_vertex()) {
     Edge edge_to_parent;
 
-#if defined(PBGL_HOHBERG_DEBUG) and PBGL_HOHBERG_DEBUG > 1
+#if defined(PBGL_HOHBERG_DEBUG) && PBGL_HOHBERG_DEBUG > 1
      std::cerr << local(alpha) << '@' << owner(alpha) << " echo: parent = "
                << local(parent) << '@' << owner(parent) << ", eta = "
                << local(eta) << '@' << owner(eta) << ", Gamma = ";
@@ -759,7 +759,7 @@
       if (target(e, g) == parent && parent == eta) {
         edge_to_parent = e;
         if (find(bicomp.begin(), bicomp.end(), alpha) == bicomp.end()) {
-#if defined(PBGL_HOHBERG_DEBUG) and PBGL_HOHBERG_DEBUG > 1
+#if defined(PBGL_HOHBERG_DEBUG) && PBGL_HOHBERG_DEBUG > 1
           std::cerr << local(alpha) << '@' << owner(alpha) << ' ';
 #endif
           bicomp.push_back(alpha);
@@ -777,7 +777,7 @@
             ++pos;
             if (pos != edata.msg.path_or_bicomp.end()
                 && find(bicomp.begin(), bicomp.end(), *pos) == bicomp.end()) {
-#if defined(PBGL_HOHBERG_DEBUG) and PBGL_HOHBERG_DEBUG > 1
+#if defined(PBGL_HOHBERG_DEBUG) && PBGL_HOHBERG_DEBUG > 1
               std::cerr << local(*pos) << '@' << owner(*pos) << ' ';
 #endif
               bicomp.push_back(*pos);
@@ -787,7 +787,7 @@
           for (path_iterator i = edata.msg.path_or_bicomp.begin();
                i != edata.msg.path_or_bicomp.end(); ++i) {
             if (find(bicomp.begin(), bicomp.end(), *i) == bicomp.end()) {
-#if defined(PBGL_HOHBERG_DEBUG) and PBGL_HOHBERG_DEBUG > 1
+#if defined(PBGL_HOHBERG_DEBUG) && PBGL_HOHBERG_DEBUG > 1
               std::cerr << local(*i) << '@' << owner(*i) << ' ';
 #endif
               bicomp.push_back(*i);