Updated deprecated uses of boost/bind.hpp, replaced standard function wrappers.

boost/bind.hpp generates deprecation warnings about global placeholder argument
keywords. This commit updates to boost/bind/bind.hpp and namespaced keywords.

Also, this commit replaces standard function object wrappers, which were removed
from C++20, with boost::bind.

Author: Lastique

example/options_heirarchy.cpp

@@ -21,12 +21,14 @@
 //
 
 #include <boost/program_options.hpp>
-namespace po = boost::program_options;
 #include <string>
 #include <iostream>
 #include <map>
 #include <stdexcept>
 #include <fstream>
+#include <boost/bind/bind.hpp>
+
+namespace po = boost::program_options;
 
 const std::string version("1.0");
 
@@ -221,7 +223,7 @@ class OptionsHeirarchy
          // The next two lines are the crazy syntax to use EnvironmentMapper as
          // the lookup function for env->config name conversions
          boost::function1<std::string, std::string>(
-         std::bind1st(std::mem_fun(&OptionsHeirarchy::EnvironmentMapper), this))),
+         boost::bind(&OptionsHeirarchy::EnvironmentMapper, this))),
          results);
       notify(results);
    }

src/cmdline.cpp

@@ -15,7 +15,7 @@
 #include <boost/program_options/positional_options.hpp>
 #include <boost/throw_exception.hpp>
 
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 #include <string>
 #include <utility>
@@ -224,24 +224,24 @@ namespace boost { namespace program_options { namespace detail {
 
         if (m_additional_parser)
             style_parsers.push_back(
-                boost::bind(&cmdline::handle_additional_parser, this, _1));
+                boost::bind(&cmdline::handle_additional_parser, this, boost::placeholders::_1));
 
         if (m_style & allow_long)
             style_parsers.push_back(
-                boost::bind(&cmdline::parse_long_option, this, _1));
+                boost::bind(&cmdline::parse_long_option, this, boost::placeholders::_1));
 
         if ((m_style & allow_long_disguise))
             style_parsers.push_back(
-                boost::bind(&cmdline::parse_disguised_long_option, this, _1));
+                boost::bind(&cmdline::parse_disguised_long_option, this, boost::placeholders::_1));
 
         if ((m_style & allow_short) && (m_style & allow_dash_for_short))
             style_parsers.push_back(
-                boost::bind(&cmdline::parse_short_option, this, _1));
+                boost::bind(&cmdline::parse_short_option, this, boost::placeholders::_1));
 
         if ((m_style & allow_short) && (m_style & allow_slash_for_short))
-            style_parsers.push_back(boost::bind(&cmdline::parse_dos_option, this, _1));
+            style_parsers.push_back(boost::bind(&cmdline::parse_dos_option, this, boost::placeholders::_1));
 
-        style_parsers.push_back(boost::bind(&cmdline::parse_terminator, this, _1));
+        style_parsers.push_back(boost::bind(&cmdline::parse_terminator, this, boost::placeholders::_1));
 
         vector<option> result;
         vector<string>& args = m_args;

src/convert.cpp

@@ -19,7 +19,7 @@
 #include <boost/program_options/detail/utf8_codecvt_facet.hpp>
 #include <boost/throw_exception.hpp>
 
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 
 using namespace std;
 
@@ -89,6 +89,7 @@ namespace boost {
     from_8_bit(const std::string& s, 
                const std::codecvt<wchar_t, char, std::mbstate_t>& cvt)
     {
+        using namespace boost::placeholders;
         return detail::convert<wchar_t>(
             s,                 
             boost::bind(&std::codecvt<wchar_t, char, mbstate_t>::in,
@@ -100,6 +101,7 @@ namespace boost {
     to_8_bit(const std::wstring& s, 
              const std::codecvt<wchar_t, char, std::mbstate_t>& cvt)
     {
+        using namespace boost::placeholders;
         return detail::convert<char>(
             s,                 
             boost::bind(&codecvt<wchar_t, char, mbstate_t>::out,

src/parsers.cpp

@@ -16,7 +16,7 @@
 #include <boost/program_options/environment_iterator.hpp>
 #include <boost/program_options/detail/convert.hpp>
 
-#include <boost/bind.hpp>
+#include <boost/bind/bind.hpp>
 #include <boost/throw_exception.hpp>
 
 #include <cctype>
@@ -75,12 +75,12 @@ namespace boost { namespace program_options {
 
             std::transform(opt.value.begin(), opt.value.end(),
                            back_inserter(result.value),
-                           boost::bind(from_utf8, _1));
+                           boost::bind(from_utf8, boost::placeholders::_1));
 
             std::transform(opt.original_tokens.begin(), 
                            opt.original_tokens.end(),
                            back_inserter(result.original_tokens),
-                           boost::bind(from_utf8, _1));
+                           boost::bind(from_utf8, boost::placeholders::_1));
             return result;
         }
     }

test/test_convert.cpp

@@ -10,8 +10,6 @@
 #include <sstream>
 #include <iostream>
 #include <boost/progress.hpp>
-#include <boost/bind.hpp>
-#include <boost/ref.hpp>
 
 #include <boost/program_options/detail/convert.hpp>
 #include <boost/program_options/detail/utf8_codecvt_facet.hpp>