From badade784298ff646b7867f8da5da80a212ae40b Mon Sep 17 00:00:00 2001
From: Vladimir Prus <ghost@cs.msu.su>
Date: Sat, 6 Jun 2009 19:57:16 +0000
Subject: [PATCH] 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.


[SVN r53700]
---
 src/cmdline.cpp | 12 ++++++------
 src/parsers.cpp |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/cmdline.cpp b/src/cmdline.cpp
index 34b191f..59cc980 100644
--- a/src/cmdline.cpp
+++ b/src/cmdline.cpp
@@ -196,24 +196,24 @@ namespace boost { namespace program_options { namespace detail {
 
         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())
diff --git a/src/parsers.cpp b/src/parsers.cpp
index 21a09f2..1154d3a 100644
--- a/src/parsers.cpp
+++ b/src/parsers.cpp
@@ -71,12 +71,12 @@ namespace boost { namespace program_options {
             
             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;
         }
     }