[Boost-commit] svn:boost r82512 - in branches/release: . boost boost/xpressive boost/xpressive/detail/utility

Subject: [Boost-commit] svn:boost r82512 - in branches/release: . boost boost/xpressive boost/xpressive/detail/utility
From: eric_at_[hidden]
Date: 2013-01-16 16:23:33

Author: eric_niebler
Date: 2013-01-16 16:23:32 EST (Wed, 16 Jan 2013)
New Revision: 82512
URL: http://svn.boost.org/trac/boost/changeset/82512

Log:
merge [82336] from trunk
Properties modified: 
   branches/release/   (props changed)
   branches/release/boost/   (props changed)
   branches/release/boost/xpressive/   (props changed)
Text files modified: 
   branches/release/boost/xpressive/detail/utility/symbols.hpp |     6 ++++++                                  
   1 files changed, 6 insertions(+), 0 deletions(-)

Modified: branches/release/boost/xpressive/detail/utility/symbols.hpp
==============================================================================
--- branches/release/boost/xpressive/detail/utility/symbols.hpp	(original)
+++ branches/release/boost/xpressive/detail/utility/symbols.hpp	2013-01-16 16:23:32 EST (Wed, 16 Jan 2013)
@@ -206,8 +206,10 @@
         result_type search(BidiIter &begin, BidiIter end, Trans trans, node* p) const
         {
             result_type r = 0;
+            #ifdef BOOST_DISABLE_THREADS
             node* p2 = p;
             bool left = false;
+            #endif
             char_type c1 = (begin != end ? trans(*begin) : 0);
             while(p)
             {
@@ -245,14 +247,18 @@
                 }
                 else if(c1 < p->ch)
                 {
+                    #ifdef BOOST_DISABLE_THREADS
                     left = true;
                     p2 = p;
+                    #endif
                     p = p->lo;
                 }
                 else // (c1 > p->ch)
                 {
+                    #ifdef BOOST_DISABLE_THREADS
                     left = false;
                     p2 = p;
+                    #endif
                     p = p->hi;
                 }
             }