[Boost-commit] svn:boost r53109 - trunk/boost/graph/detail

Subject: [Boost-commit] svn:boost r53109 - trunk/boost/graph/detail
From: jewillco_at_[hidden]
Date: 2009-05-19 10:43:04

Author: jewillco
Date: 2009-05-19 10:43:02 EDT (Tue, 19 May 2009)
New Revision: 53109
URL: http://svn.boost.org/trac/boost/changeset/53109

Log:
Fixed redefinition error from bug #3048
Text files modified: 
   trunk/boost/graph/detail/read_graphviz_new.hpp |     8 ++++----                                
   1 files changed, 4 insertions(+), 4 deletions(-)

Modified: trunk/boost/graph/detail/read_graphviz_new.hpp
==============================================================================
--- trunk/boost/graph/detail/read_graphviz_new.hpp	(original)
+++ trunk/boost/graph/detail/read_graphviz_new.hpp	2009-05-19 10:43:02 EDT (Tue, 19 May 2009)
@@ -313,7 +313,7 @@
 
   template <typename BidirectionalIterator, typename Policy>
   struct parser {
-    tokenizer<BidirectionalIterator> tokenizer;
+    tokenizer<BidirectionalIterator> the_tokenizer;
     std::vector<token> lookahead;
     bool graph_is_directed;
     properties graph_props;
@@ -322,11 +322,11 @@
     Policy hooks;
 
     parser(BidirectionalIterator begin, BidirectionalIterator end, Policy hooks)
-      : tokenizer(begin, end), lookahead(), hooks(hooks) {}
+      : the_tokenizer(begin, end), lookahead(), hooks(hooks) {}
 
     token get() {
       if (lookahead.empty()) {
-        token t = tokenizer.get_token();
+        token t = the_tokenizer.get_token();
         return t;
       } else {
         token t = lookahead.front();
@@ -337,7 +337,7 @@
 
     token peek() {
       if (lookahead.empty()) {
-        lookahead.push_back(tokenizer.get_token());
+        lookahead.push_back(the_tokenizer.get_token());
       }
       return lookahead.front();
     }