Repository: mesos
Updated Branches:
  refs/heads/1.2.x 1eb8871c2 -> 854712fbd


Concatenation for HTTP Headers.

Added http::Headers::operator+().

Review: https://reviews.apache.org/r/58753/


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/e0c08799
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/e0c08799
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/e0c08799

Branch: refs/heads/1.2.x
Commit: e0c08799ef738ccb637115dff24958afeb4cbe1b
Parents: 1eb8871
Author: Chun-Hung Hsiao <[email protected]>
Authored: Wed Apr 26 14:15:38 2017 -0700
Committer: Jie Yu <[email protected]>
Committed: Fri May 5 15:04:02 2017 -0700

----------------------------------------------------------------------
 3rdparty/libprocess/include/process/http.hpp | 7 +++++++
 1 file changed, 7 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/e0c08799/3rdparty/libprocess/include/process/http.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/http.hpp 
b/3rdparty/libprocess/include/process/http.hpp
index eb2c87d..93c2c4a 100644
--- a/3rdparty/libprocess/include/process/http.hpp
+++ b/3rdparty/libprocess/include/process/http.hpp
@@ -503,6 +503,13 @@ public:
         CaseInsensitiveHash,
         CaseInsensitiveEqual>::get(key);
   }
+
+  Headers operator+(const Headers& that) const
+  {
+    Headers result = *this;
+    result.insert(that.begin(), that.end());
+    return result;
+  }
 };
 
 

Reply via email to