Replaced circular include dependency w/ TODO. Review: https://reviews.apache.org/r/28061
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/d1d43403 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/d1d43403 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/d1d43403 Branch: refs/heads/master Commit: d1d43403b49c4692ca93e545cd94d0c277719b05 Parents: b774ecb Author: Benjamin Hindman <[email protected]> Authored: Fri Nov 14 15:56:41 2014 -0800 Committer: Benjamin Hindman <[email protected]> Committed: Sat Nov 15 16:27:57 2014 -0800 ---------------------------------------------------------------------- 3rdparty/libprocess/include/process/clock.hpp | 5 ++++- 3rdparty/libprocess/include/process/timeout.hpp | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/d1d43403/3rdparty/libprocess/include/process/clock.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/include/process/clock.hpp b/3rdparty/libprocess/include/process/clock.hpp index db0fb04..1fd418b 100644 --- a/3rdparty/libprocess/include/process/clock.hpp +++ b/3rdparty/libprocess/include/process/clock.hpp @@ -4,7 +4,10 @@ #include <list> #include <process/time.hpp> -#include <process/timer.hpp> + +// TODO(benh): We should really be including <process/timer.hpp> but +// there are currently too many circular dependencies in header files +// that would need to get moved to translation units first. #include <stout/duration.hpp> #include <stout/lambda.hpp> http://git-wip-us.apache.org/repos/asf/mesos/blob/d1d43403/3rdparty/libprocess/include/process/timeout.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/include/process/timeout.hpp b/3rdparty/libprocess/include/process/timeout.hpp index 0bf63e1..5c46d70 100644 --- a/3rdparty/libprocess/include/process/timeout.hpp +++ b/3rdparty/libprocess/include/process/timeout.hpp @@ -2,7 +2,6 @@ #define __PROCESS_TIMEOUT_HPP__ #include <process/clock.hpp> - #include <process/time.hpp> #include <stout/duration.hpp>
