You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by be...@apache.org on 2015/04/26 21:43:37 UTC
[04/10] mesos git commit: Removed pre-C++11 codepath in Mesos.
Removed pre-C++11 codepath in Mesos.
Review: https://reviews.apache.org/r/33562
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/48c72969
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/48c72969
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/48c72969
Branch: refs/heads/master
Commit: 48c729699dc86f2e34f90b8f9cf2e7adf69d4220
Parents: 5ab8ff8
Author: Michael Park <mc...@gmail.com>
Authored: Sun Apr 26 12:23:08 2015 -0700
Committer: Benjamin Hindman <be...@gmail.com>
Committed: Sun Apr 26 12:23:08 2015 -0700
----------------------------------------------------------------------
include/mesos/scheduler.hpp | 17 -----------------
1 file changed, 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/48c72969/include/mesos/scheduler.hpp
----------------------------------------------------------------------
diff --git a/include/mesos/scheduler.hpp b/include/mesos/scheduler.hpp
index efee2cb..2ee6b5c 100644
--- a/include/mesos/scheduler.hpp
+++ b/include/mesos/scheduler.hpp
@@ -19,12 +19,7 @@
#ifndef __MESOS_SCHEDULER_HPP__
#define __MESOS_SCHEDULER_HPP__
-#if __cplusplus >= 201103L
#include <functional>
-#else // __cplusplus >= 201103L
-#include <tr1/functional>
-#endif // __cplusplus >= 201103L
-
#include <queue>
#include <pthread.h>
@@ -489,29 +484,17 @@ class Mesos
{
public:
Mesos(const std::string& master,
-#if __cplusplus >= 201103L
const std::function<void(void)>& connected,
const std::function<void(void)>& disconnected,
const std::function<void(const std::queue<Event>&)>& received);
-#else // __cplusplus >= 201103L
- const std::tr1::function<void(void)>& connected,
- const std::tr1::function<void(void)>& disconnected,
- const std::tr1::function<void(const std::queue<Event>&)>& received);
-#endif // __cplusplus >= 201103L
// Same as the above constructor but takes 'credential' as argument.
// The credential will be used for authenticating with the master.
Mesos(const std::string& master,
const Credential& credential,
-#if __cplusplus >= 201103L
const std::function<void(void)>& connected,
const std::function<void(void)>& disconnected,
const std::function<void(const std::queue<Event>&)>& received);
-#else // __cplusplus >= 201103L
- const std::tr1::function<void(void)>& connected,
- const std::tr1::function<void(void)>& disconnected,
- const std::tr1::function<void(const std::queue<Event>&)>& received);
-#endif // __cplusplus >= 201103L
virtual ~Mesos();