Browse code

work around scope issue in clang 3.1

git-svn-id: file:///home/git/hedgehog.fhcrc.org/bioconductor/branches/RELEASE_2_12/madman/Rpacks/RBGL@75890 bc3139a8-67e5-0310-9ffc-ced21a209358

Martin Morgan authored on 22/04/2013 21:35:29
Showing 2 changed files

... ...
@@ -1,5 +1,5 @@
1 1
 Package: RBGL
2
-Version: 1.36.0
2
+Version: 1.36.1
3 3
 Title: An interface to the BOOST graph library
4 4
 Author: Vince Carey <stvjc@channing.harvard.edu>, Li Long
5 5
         <li.long@isb-sib.ch>, R. Gentleman
... ...
@@ -23,7 +23,7 @@ extern "C"
23 23
     static bool isClique(Graph_ud& g, graph_traits < Graph_ud >::vertex_descriptor v)
24 24
     {
25 25
         typedef graph_traits < Graph_ud >::edge_descriptor Edge;
26
-        std::pair<Edge, bool> p;
26
+        std::pair<Edge, bool> pp;
27 27
 
28 28
         Graph_ud::adjacency_iterator va, va_last, va1, va2;
29 29
 
... ...
@@ -50,8 +50,8 @@ extern "C"
50 50
 #if DEBUG
51 51
                 cout << "    " << *va1+1 << "--" << *va2+1 << endl;
52 52
 #endif
53
-                p = edge(*va1, *va2, g);
54
-                if ( !p.second ) return FALSE;
53
+                pp = edge(*va1, *va2, g);
54
+                if ( !pp.second ) return FALSE;
55 55
             }
56 56
         }
57 57