[Boost-commit] svn:boost r53700 - trunk/libs/program_options/src

Subject: [Boost-commit] svn:boost r53700 - trunk/libs/program_options/src
From: ghost_at_[hidden]
Date: 2009-06-06 15:57:17

Author: vladimir_prus
Date: 2009-06-06 15:57:16 EDT (Sat, 06 Jun 2009)
New Revision: 53700
URL: http://svn.boost.org/trac/boost/changeset/53700

Log:
Explicitly-qualify the use of boost::bind.

It appears that MSVC 10 puts tr1's bind into std namespace, which
clases with boost::bind thanks to ADL.
Closes #3072. Patch from Richard Webb.

Text files modified: 
   trunk/libs/program_options/src/cmdline.cpp |    12 ++++++------                            
   trunk/libs/program_options/src/parsers.cpp |     4 ++--                                    
   2 files changed, 8 insertions(+), 8 deletions(-)

Modified: trunk/libs/program_options/src/cmdline.cpp
==============================================================================
--- trunk/libs/program_options/src/cmdline.cpp	(original)
+++ trunk/libs/program_options/src/cmdline.cpp	2009-06-06 15:57:16 EDT (Sat, 06 Jun 2009)
@@ -196,24 +196,24 @@
 
         if (m_additional_parser)
             style_parsers.push_back(
-                bind(&cmdline::handle_additional_parser, this, _1));
+                boost::bind(&cmdline::handle_additional_parser, this, _1));
 
         if (m_style & allow_long)
             style_parsers.push_back(
-                bind(&cmdline::parse_long_option, this, _1));
+                boost::bind(&cmdline::parse_long_option, this, _1));
 
         if ((m_style & allow_long_disguise))
             style_parsers.push_back(
-                bind(&cmdline::parse_disguised_long_option, this, _1));
+                boost::bind(&cmdline::parse_disguised_long_option, this, _1));
 
         if ((m_style & allow_short) && (m_style & allow_dash_for_short))
             style_parsers.push_back(
-                bind(&cmdline::parse_short_option, this, _1));
+                boost::bind(&cmdline::parse_short_option, this, _1));
 
         if ((m_style & allow_short) && (m_style & allow_slash_for_short))
-            style_parsers.push_back(bind(&cmdline::parse_dos_option, this, _1));
+            style_parsers.push_back(boost::bind(&cmdline::parse_dos_option, this, _1));
 
-        style_parsers.push_back(bind(&cmdline::parse_terminator, this, _1));
+        style_parsers.push_back(boost::bind(&cmdline::parse_terminator, this, _1));
 
         vector<option> result;
         while(!args.empty())

Modified: trunk/libs/program_options/src/parsers.cpp
==============================================================================
--- trunk/libs/program_options/src/parsers.cpp	(original)
+++ trunk/libs/program_options/src/parsers.cpp	2009-06-06 15:57:16 EDT (Sat, 06 Jun 2009)
@@ -71,12 +71,12 @@
             
             std::transform(opt.value.begin(), opt.value.end(),
                            back_inserter(result.value),
-                           bind(from_utf8, _1));
+                           boost::bind(from_utf8, _1));
 
             std::transform(opt.original_tokens.begin(), 
                            opt.original_tokens.end(),
                            back_inserter(result.original_tokens),
-                           bind(from_utf8, _1));
+                           boost::bind(from_utf8, _1));
             return result;
         }
     }