You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by nn...@apache.org on 2014/01/15 18:15:49 UTC
git commit: Fixed control flow compiler warning in encoder.hpp.
Updated Branches:
refs/heads/master 1d8382e71 -> 560d4576b
Fixed control flow compiler warning in encoder.hpp.
Fixes warning of "control may reach end of non-void function" in
encoder.hpp that occurs when compiling using clang.
From: TILL TOENSHOFF <to...@me.com>
Review: https://reviews.apache.org/r/16897
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/560d4576
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/560d4576
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/560d4576
Branch: refs/heads/master
Commit: 560d4576b75b685516ecd3d30396364ea3360352
Parents: 1d8382e
Author: Niklas Q. Nielsen <ni...@mesosphere.io>
Authored: Wed Jan 15 16:57:25 2014 +0000
Committer: Niklas Q. Nielsen <ni...@mesosphere.io>
Committed: Wed Jan 15 16:57:25 2014 +0000
----------------------------------------------------------------------
3rdparty/libprocess/src/encoder.hpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/560d4576/3rdparty/libprocess/src/encoder.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/encoder.hpp b/3rdparty/libprocess/src/encoder.hpp
index 55aba22..be6b667 100644
--- a/3rdparty/libprocess/src/encoder.hpp
+++ b/3rdparty/libprocess/src/encoder.hpp
@@ -101,9 +101,9 @@ public:
static std::string encode(Message* message)
{
- if (message != NULL) {
- std::ostringstream out;
+ std::ostringstream out;
+ if (message != NULL) {
out << "POST /" << message->to.id << "/" << message->name
<< " HTTP/1.0\r\n"
<< "User-Agent: libprocess/" << message->from << "\r\n"
@@ -119,9 +119,9 @@ public:
} else {
out << "\r\n";
}
-
- return out.str();
}
+
+ return out.str();
}
private: