You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by dm...@apache.org on 2014/08/12 01:12:07 UTC

git commit: Changed Try::error and Result::error to return const references.

Repository: mesos
Updated Branches:
  refs/heads/master 7933de5ca -> 37b9676c8


Changed Try::error and Result::error to return const references.

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


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

Branch: refs/heads/master
Commit: 37b9676c8c5c2db61c1316cbc2ffd5467509a47f
Parents: 7933de5
Author: Vinod Kone <vi...@twitter.com>
Authored: Fri Mar 21 11:38:23 2014 -0700
Committer: Dominic Hamon <dh...@twitter.com>
Committed: Mon Aug 11 16:11:39 2014 -0700

----------------------------------------------------------------------
 3rdparty/libprocess/3rdparty/stout/include/stout/result.hpp | 3 +--
 3rdparty/libprocess/3rdparty/stout/include/stout/try.hpp    | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/37b9676c/3rdparty/libprocess/3rdparty/stout/include/stout/result.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/result.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/result.hpp
index 3a10379..ce8dd9b 100644
--- a/3rdparty/libprocess/3rdparty/stout/include/stout/result.hpp
+++ b/3rdparty/libprocess/3rdparty/stout/include/stout/result.hpp
@@ -111,8 +111,7 @@ public:
     return *t;
   }
 
-  // TODO(dhamon): Return const std::string& to remove copy.
-  std::string error() const { assert(state == ERROR); return message; }
+  const std::string& error() const { assert(state == ERROR); return message; }
 
 private:
   enum State {

http://git-wip-us.apache.org/repos/asf/mesos/blob/37b9676c/3rdparty/libprocess/3rdparty/stout/include/stout/try.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/try.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/try.hpp
index d99b75a..87c5fc8 100644
--- a/3rdparty/libprocess/3rdparty/stout/include/stout/try.hpp
+++ b/3rdparty/libprocess/3rdparty/stout/include/stout/try.hpp
@@ -95,8 +95,7 @@ public:
     return *t;
   }
 
-  // TODO(bmahler): Consider returning const string& to eliminate copy.
-  std::string error() const { assert(state == ERROR); return message; }
+  const std::string& error() const { assert(state == ERROR); return message; }
 
 private:
   enum State {