Merge branch 'develop' into potpourri

boostorg · Jun 13, 2023 · cd0adf5 · cd0adf5
2 parents f8b7bf9 + 70c7ae6
commit cd0adf5
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/include/boost/process/environment.hpp b/include/boost/process/environment.hpp
@@ -264,6 +264,7 @@ class basic_environment_impl : public Implementation<Char>
         while (*p != nullptr)
         {
             const std::size_t len = std::char_traits<Char>::length(*p);
+
             if ((std::distance(st1.begin(), st1.end()) < len)
                  && std::equal(st1.begin(), st1.end(), *p))
                 break;

diff --git a/include/boost/process/v2/environment.hpp b/include/boost/process/v2/environment.hpp
@@ -502,8 +502,8 @@ struct key
 
     template< class Source >
     key( const Source& source,
-        decltype(source.data()) = nullptr,
-        decltype(source.size()) = 0u)
+        decltype(std::declval<Source>().data()) = nullptr,
+        decltype(std::declval<Source>().size()) = 0u)
         : value_(
              BOOST_PROCESS_V2_NAMESPACE::detail::conv_string<char_type, traits_type>(
                 source.data(), source.size()))
@@ -725,8 +725,8 @@ struct value
 
     template< class Source >
     value( const Source& source,
-           decltype(source.data()) = nullptr,
-    decltype(source.size()) = 0u)
+           decltype(std::declval<Source>().data()) = nullptr,
+    decltype(std::declval<Source>().size()) = 0u)
     : value_(BOOST_PROCESS_V2_NAMESPACE::detail::conv_string<char_type, traits_type>(
         source.data(), source.size()))
     {
@@ -975,8 +975,8 @@ struct key_value_pair
 
     template< class Source >
     key_value_pair( const Source& source,
-           decltype(source.data()) = nullptr,
-           decltype(source.size()) = 0u)
+           decltype(std::declval<Source>().data()) = nullptr,
+           decltype(std::declval<Source>().size()) = 0u)
             : value_(BOOST_PROCESS_V2_NAMESPACE::detail::conv_string<char_type, traits_type>(
                 source.data(), source.size()))
     {
@@ -1744,8 +1744,8 @@ struct process_environment
     return build_env(env_buffer);
   }
 
-  process_environment(std::initializer_list<string_view> sv)  : unicode_env{build_env(sv,  "")} {}
-  process_environment(std::initializer_list<wstring_view> sv) : unicode_env{build_env(sv, L"")} {}
+  process_environment(std::initializer_list<string_view> sv)  : unicode_env{build_env(sv)} {}
+  process_environment(std::initializer_list<wstring_view> sv) : unicode_env{build_env(sv)} {}
 
   template<typename Args>
   process_environment(Args && args) : unicode_env{build_env(std::forward<Args>(args))}