rename emplace functions

fix #387

include/boost/url/impl/params.hpp

@@ -254,7 +254,11 @@ insert(
     iterator before,
     FwdIt first,
     FwdIt last) ->
-        iterator
+        typename std::enable_if<
+            !std::is_convertible<
+                FwdIt, string_view
+                >::value,
+            iterator>::type
 {
     return insert(before, first, last,
         typename std::iterator_traits<
@@ -359,7 +363,7 @@ replace(
 inline
 auto
 params::
-emplace_at(
+replace(
     iterator pos,
     string_view key,
     string_view value) ->
@@ -389,7 +393,7 @@ emplace_at(
 inline
 auto
 params::
-emplace_at(
+replace(
     iterator pos,
     string_view key) ->
         iterator
@@ -414,7 +418,7 @@ emplace_at(
 inline
 auto
 params::
-emplace_before(
+insert(
     iterator before,
     string_view key,
     string_view value) ->
@@ -431,7 +435,7 @@ emplace_before(
 inline
 auto
 params::
-emplace_before(
+insert(
     iterator before,
     string_view key) ->
         iterator
@@ -458,7 +462,7 @@ erase(iterator pos) ->
 inline
 auto
 params::
-emplace_back(
+append(
     string_view key) ->
         iterator
 {
@@ -470,7 +474,7 @@ emplace_back(
 inline
 auto
 params::
-emplace_back(
+append(
     string_view key,
     string_view value) ->
         iterator

include/boost/url/impl/params_encoded.hpp

@@ -272,7 +272,11 @@ insert(
     iterator before,
     FwdIt first,
     FwdIt last) ->
-        iterator
+        typename std::enable_if<
+            !std::is_convertible<
+                FwdIt, string_view
+                >::value,
+            iterator>::type
 {
     return insert(before, first, last,
         typename std::iterator_traits<
@@ -377,7 +381,7 @@ replace(
 inline
 auto
 params_encoded::
-emplace_at(
+replace(
     iterator pos,
     string_view key,
     string_view value) ->
@@ -405,7 +409,7 @@ emplace_at(
 inline
 auto
 params_encoded::
-emplace_back(
+append(
     string_view key) ->
         iterator
 {
@@ -417,7 +421,7 @@ emplace_back(
 inline
 auto
 params_encoded::
-emplace_back(
+append(
     string_view key,
     string_view value) ->
         iterator
@@ -430,7 +434,7 @@ emplace_back(
 inline
 auto
 params_encoded::
-emplace_at(
+replace(
     iterator pos,
     string_view key) ->
         iterator
@@ -459,7 +463,7 @@ emplace_at(
 inline
 auto
 params_encoded::
-emplace_before(
+insert(
     iterator before,
     string_view key,
     string_view value) ->
@@ -476,7 +480,7 @@ emplace_before(
 inline
 auto
 params_encoded::
-emplace_before(
+insert(
     iterator before,
     string_view key) ->
         iterator

include/boost/url/impl/params_encoded.ipp

@@ -119,7 +119,7 @@ replace_value(
     string_view value) ->
         iterator
 {
-    return emplace_at(
+    return replace(
         pos,
         (*pos).key,
         value);

include/boost/url/params.hpp

@@ -331,7 +331,15 @@ public:
 
      */
     template<class FwdIt>
+#ifndef BOOST_URL_DOCS
+    typename std::enable_if<
+        !std::is_convertible<
+            FwdIt, string_view
+            >::value,
+        iterator>::type
+#else
     iterator
+#endif
     insert(
         iterator before,
         FwdIt first,
@@ -470,7 +478,7 @@ public:
 
      */
     iterator
-    emplace_at(
+    replace(
         iterator pos,
         string_view key,
         string_view value);
@@ -490,7 +498,7 @@ public:
 
       */
     iterator
-    emplace_at(
+    replace(
         iterator pos,
         string_view key);
 
@@ -506,7 +514,7 @@ public:
 
       */
     iterator
-    emplace_before(
+    insert(
         iterator before,
         string_view key,
         string_view value);
@@ -521,7 +529,7 @@ public:
 
       */
     iterator
-    emplace_before(
+    insert(
         iterator before,
         string_view key);
 
@@ -569,7 +577,7 @@ public:
 
       */
     iterator
-    emplace_back(
+    append(
         string_view key);
 
     /** Construct element at the end of the container
@@ -582,7 +590,7 @@ public:
 
       */
     iterator
-    emplace_back(
+    append(
         string_view key,
         string_view value);
 

include/boost/url/params_encoded.hpp

@@ -386,7 +386,15 @@ public:
 
       */
     template<class FwdIt>
+#ifndef BOOST_URL_DOCS
+    typename std::enable_if<
+        !std::is_convertible<
+            FwdIt, string_view
+            >::value,
+        iterator>::type
+#else
     iterator
+#endif
     insert(
         iterator before,
         FwdIt first,
@@ -534,7 +542,7 @@ public:
 
       */
     iterator
-    emplace_at(
+    replace(
         iterator pos,
         string_view key,
         string_view value);
@@ -555,7 +563,7 @@ public:
 
       */
     iterator
-    emplace_at(
+    replace(
         iterator pos,
         string_view key);
 
@@ -571,8 +579,8 @@ public:
 
       */
     iterator
-    emplace_before(
-        iterator before,
+    insert(
+        iterator before, // used to be emplace_before
         string_view key,
         string_view value);
 
@@ -586,8 +594,8 @@ public:
 
       */
     iterator
-    emplace_before(
-        iterator before,
+    insert(
+        iterator before, // used to be emplace_before
         string_view key);
 
     //--------------------------------------------
@@ -638,7 +646,7 @@ public:
 
       */
     iterator
-    emplace_back(
+    append(
         string_view key);
 
     /** Construct element at the last position of the container
@@ -651,7 +659,7 @@ public:
 
       */
     iterator
-    emplace_back(
+    append(
         string_view key,
         string_view value);