libprocess: Removed whitespace padding in overloaded operators. Review: https://reviews.apache.org/r/37017
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/5af9fb41 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/5af9fb41 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/5af9fb41 Branch: refs/heads/master Commit: 5af9fb412a354241d39640bcd25c171bbe8c7f19 Parents: bce0a37 Author: Artem Harutyunyan <[email protected]> Authored: Sun Aug 9 19:11:46 2015 -0400 Committer: Michael Park <[email protected]> Committed: Sun Aug 9 19:11:48 2015 -0400 ---------------------------------------------------------------------- 3rdparty/libprocess/include/process/address.hpp | 10 +++--- 3rdparty/libprocess/include/process/async.hpp | 4 +-- .../libprocess/include/process/deferred.hpp | 16 ++++----- 3rdparty/libprocess/include/process/event.hpp | 10 +++--- .../libprocess/include/process/executor.hpp | 2 +- 3rdparty/libprocess/include/process/future.hpp | 18 +++++------ 3rdparty/libprocess/include/process/gmock.hpp | 2 +- 3rdparty/libprocess/include/process/http.hpp | 22 ++++++------- 3rdparty/libprocess/include/process/latch.hpp | 6 ++-- 3rdparty/libprocess/include/process/limiter.hpp | 4 +-- .../include/process/metrics/counter.hpp | 6 ++-- .../include/process/metrics/metrics.hpp | 2 +- 3rdparty/libprocess/include/process/once.hpp | 2 +- 3rdparty/libprocess/include/process/owned.hpp | 16 ++++----- 3rdparty/libprocess/include/process/pid.hpp | 19 ++++++----- .../libprocess/include/process/protobuf.hpp | 2 +- .../libprocess/include/process/sequence.hpp | 2 +- 3rdparty/libprocess/include/process/shared.hpp | 16 ++++----- 3rdparty/libprocess/include/process/socket.hpp | 4 +-- 3rdparty/libprocess/include/process/time.hpp | 34 ++++++++++---------- 3rdparty/libprocess/include/process/timeout.hpp | 10 +++--- 3rdparty/libprocess/include/process/timer.hpp | 4 +-- 3rdparty/libprocess/src/http.cpp | 4 +-- 3rdparty/libprocess/src/pid.cpp | 4 +-- 3rdparty/libprocess/src/process_reference.hpp | 8 ++--- 3rdparty/libprocess/src/test-master.cpp | 2 +- 3rdparty/libprocess/src/test-slave.cpp | 2 +- 3rdparty/libprocess/src/tests/process_tests.cpp | 4 +-- 3rdparty/libprocess/src/time.cpp | 4 +-- 29 files changed, 116 insertions(+), 123 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/5af9fb41/3rdparty/libprocess/include/process/address.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/include/process/address.hpp b/3rdparty/libprocess/include/process/address.hpp index be216db..df78f8e 100644 --- a/3rdparty/libprocess/include/process/address.hpp +++ b/3rdparty/libprocess/include/process/address.hpp @@ -103,7 +103,7 @@ public: } } - bool operator < (const Address& that) const + bool operator<(const Address& that) const { if (ip == that.ip) { return port < that.port; @@ -112,7 +112,7 @@ public: } } - bool operator > (const Address& that) const + bool operator>(const Address& that) const { if (ip == that.ip) { return port > that.port; @@ -121,12 +121,12 @@ public: } } - bool operator == (const Address& that) const + bool operator==(const Address& that) const { return (ip == that.ip && port == that.port); } - bool operator != (const Address& that) const + bool operator!=(const Address& that) const { return !(*this == that); } @@ -136,7 +136,7 @@ public: }; -inline std::ostream& operator << (std::ostream& stream, const Address& address) +inline std::ostream& operator<<(std::ostream& stream, const Address& address) { stream << address.ip << ":" << address.port; return stream; http://git-wip-us.apache.org/repos/asf/mesos/blob/5af9fb41/3rdparty/libprocess/include/process/async.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/include/process/async.hpp b/3rdparty/libprocess/include/process/async.hpp index d0c560a..676aa4c 100644 --- a/3rdparty/libprocess/include/process/async.hpp +++ b/3rdparty/libprocess/include/process/async.hpp @@ -75,7 +75,7 @@ private: // Not copyable, not assignable. AsyncExecutorProcess(const AsyncExecutorProcess&); - AsyncExecutorProcess& operator = (const AsyncExecutorProcess&); + AsyncExecutorProcess& operator=(const AsyncExecutorProcess&); template <typename F> typename lambda::result_of<F(void)>::type execute( @@ -164,7 +164,7 @@ private: // Not copyable, not assignable. AsyncExecutor(const AsyncExecutor&); - AsyncExecutor& operator = (const AsyncExecutor&); + AsyncExecutor& operator=(const AsyncExecutor&); template <typename F> Future<typename lambda::result_of<F(void)>::type> execute( http://git-wip-us.apache.org/repos/asf/mesos/blob/5af9fb41/3rdparty/libprocess/include/process/deferred.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/include/process/deferred.hpp b/3rdparty/libprocess/include/process/deferred.hpp index b11acc4..00072e0 100644 --- a/3rdparty/libprocess/include/process/deferred.hpp +++ b/3rdparty/libprocess/include/process/deferred.hpp @@ -65,7 +65,7 @@ private: template <typename F> struct _Deferred { - operator Deferred<void()> () const + operator Deferred<void()>() const { // The 'pid' differentiates an already dispatched functor versus // one which still needs to be dispatched (which is done @@ -90,7 +90,7 @@ struct _Deferred }); } - operator std::function<void()> () const + operator std::function<void()>() const { if (pid.isNone()) { return std::function<void()>(f); @@ -106,7 +106,7 @@ struct _Deferred } template <typename R> - operator Deferred<R()> () const + operator Deferred<R()>() const { if (pid.isNone()) { return std::function<R()>(f); @@ -122,7 +122,7 @@ struct _Deferred } template <typename R> - operator std::function<R()> () const + operator std::function<R()>() const { if (pid.isNone()) { return std::function<R()>(f); @@ -145,7 +145,7 @@ struct _Deferred // http://stackoverflow.com/questions/20097616/stdbind-to-a-stdfunction-crashes-with-clang). #define TEMPLATE(Z, N, DATA) \ template <ENUM_PARAMS(N, typename P)> \ - operator Deferred<void(ENUM_PARAMS(N, P))> () const \ + operator Deferred<void(ENUM_PARAMS(N, P))>() const \ { \ if (pid.isNone()) { \ return std::function<void(ENUM_PARAMS(N, P))>(f); \ @@ -164,7 +164,7 @@ struct _Deferred } \ \ template <ENUM_PARAMS(N, typename P)> \ - operator std::function<void(ENUM_PARAMS(N, P))> () const \ + operator std::function<void(ENUM_PARAMS(N, P))>() const \ { \ if (pid.isNone()) { \ return std::function<void(ENUM_PARAMS(N, P))>(f); \ @@ -187,7 +187,7 @@ struct _Deferred #define TEMPLATE(Z, N, DATA) \ template <typename R, ENUM_PARAMS(N, typename P)> \ - operator Deferred<R(ENUM_PARAMS(N, P))> () const \ + operator Deferred<R(ENUM_PARAMS(N, P))>() const \ { \ if (pid.isNone()) { \ return std::function<R(ENUM_PARAMS(N, P))>(f); \ @@ -206,7 +206,7 @@ struct _Deferred } \ \ template <typename R, ENUM_PARAMS(N, typename P)> \ - operator std::function<R(ENUM_PARAMS(N, P))> () const \ + operator std::function<R(ENUM_PARAMS(N, P))>() const \ { \ if (pid.isNone()) { \ return std::function<R(ENUM_PARAMS(N, P))>(f); \ http://git-wip-us.apache.org/repos/asf/mesos/blob/5af9fb41/3rdparty/libprocess/include/process/event.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/include/process/event.hpp b/3rdparty/libprocess/include/process/event.hpp index 522771a..16ddbd7 100644 --- a/3rdparty/libprocess/include/process/event.hpp +++ b/3rdparty/libprocess/include/process/event.hpp @@ -111,7 +111,7 @@ private: // copyable. // Note that we are violating the "rule of three" here but it helps // keep the fields const. - MessageEvent& operator = (const MessageEvent&); + MessageEvent& operator=(const MessageEvent&); }; @@ -136,7 +136,7 @@ struct HttpEvent : Event private: // Not copyable, not assignable. HttpEvent(const HttpEvent&); - HttpEvent& operator = (const HttpEvent&); + HttpEvent& operator=(const HttpEvent&); }; @@ -167,7 +167,7 @@ struct DispatchEvent : Event private: // Not copyable, not assignable. DispatchEvent(const DispatchEvent&); - DispatchEvent& operator = (const DispatchEvent&); + DispatchEvent& operator=(const DispatchEvent&); }; @@ -187,7 +187,7 @@ private: // Keep ExitedEvent not assignable even though we made it copyable. // Note that we are violating the "rule of three" here but it helps // keep the fields const. - ExitedEvent& operator = (const ExitedEvent&); + ExitedEvent& operator=(const ExitedEvent&); }; @@ -206,7 +206,7 @@ struct TerminateEvent : Event private: // Not copyable, not assignable. TerminateEvent(const TerminateEvent&); - TerminateEvent& operator = (const TerminateEvent&); + TerminateEvent& operator=(const TerminateEvent&); }; } // namespace process { http://git-wip-us.apache.org/repos/asf/mesos/blob/5af9fb41/3rdparty/libprocess/include/process/executor.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/include/process/executor.hpp b/3rdparty/libprocess/include/process/executor.hpp index 23384c2..0693e4e 100644 --- a/3rdparty/libprocess/include/process/executor.hpp +++ b/3rdparty/libprocess/include/process/executor.hpp @@ -62,7 +62,7 @@ public: private: // Not copyable, not assignable. Executor(const Executor&); - Executor& operator = (const Executor&); + Executor& operator=(const Executor&); ProcessBase process; }; http://git-wip-us.apache.org/repos/asf/mesos/blob/5af9fb41/3rdparty/libprocess/include/process/future.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/include/process/future.hpp b/3rdparty/libprocess/include/process/future.hpp index db92767..d2e2245 100644 --- a/3rdparty/libprocess/include/process/future.hpp +++ b/3rdparty/libprocess/include/process/future.hpp @@ -113,12 +113,12 @@ public: // Futures are assignable (and copyable). This results in the // reference to the previous future data being decremented and a // reference to 'that' being incremented. - Future<T>& operator = (const Future<T>& that); + Future<T>& operator=(const Future<T>& that); // Comparision operators useful for using futures in collections. - bool operator == (const Future<T>& that) const; - bool operator != (const Future<T>& that) const; - bool operator < (const Future<T>& that) const; + bool operator==(const Future<T>& that) const; + bool operator!=(const Future<T>& that) const; + bool operator<(const Future<T>& that) const; // Helpers to get the current state of this future. bool isPending() const; @@ -527,7 +527,7 @@ private: // Not copyable, not assignable. Promise(const Promise<T>&); - Promise<T>& operator = (const Promise<T>&); + Promise<T>& operator=(const Promise<T>&); // Helper for doing the work of actually discarding a future (called // from Promise::discard as well as internal::discarded). @@ -894,7 +894,7 @@ Future<T>::Future(const Try<T>& t) template <typename T> -Future<T>& Future<T>::operator = (const Future<T>& that) +Future<T>& Future<T>::operator=(const Future<T>& that) { if (this != &that) { data = that.data; @@ -904,21 +904,21 @@ Future<T>& Future<T>::operator = (const Future<T>& that) template <typename T> -bool Future<T>::operator == (const Future<T>& that) const +bool Future<T>::operator==(const Future<T>& that) const { return data == that.data; } template <typename T> -bool Future<T>::operator != (const Future<T>& that) const +bool Future<T>::operator!=(const Future<T>& that) const { return !(*this == that); } template <typename T> -bool Future<T>::operator < (const Future<T>& that) const +bool Future<T>::operator<(const Future<T>& that) const { return data < that.data; } http://git-wip-us.apache.org/repos/asf/mesos/blob/5af9fb41/3rdparty/libprocess/include/process/gmock.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/include/process/gmock.hpp b/3rdparty/libprocess/include/process/gmock.hpp index d449952..575f1ec 100644 --- a/3rdparty/libprocess/include/process/gmock.hpp +++ b/3rdparty/libprocess/include/process/gmock.hpp @@ -184,7 +184,7 @@ private: private: // Not copyable, not assignable. Implementation(const Implementation&); - Implementation& operator = (const Implementation&); + Implementation& operator=(const Implementation&); process::Promise<R> promise; const ::testing::Action<F> action; http://git-wip-us.apache.org/repos/asf/mesos/blob/5af9fb41/3rdparty/libprocess/include/process/http.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/include/process/http.hpp b/3rdparty/libprocess/include/process/http.hpp index 04c2274..7a2cc73 100644 --- a/3rdparty/libprocess/include/process/http.hpp +++ b/3rdparty/libprocess/include/process/http.hpp @@ -64,7 +64,7 @@ void initialize(); struct CaseInsensitiveHash { - size_t operator () (const std::string& key) const + size_t operator()(const std::string& key) const { size_t seed = 0; foreach (char c, key) { @@ -77,7 +77,7 @@ struct CaseInsensitiveHash struct CaseInsensitiveEqual { - bool operator () (const std::string& left, const std::string& right) const + bool operator()(const std::string& left, const std::string& right) const { if (left.size() != right.size()) { return false; @@ -180,8 +180,8 @@ public: bool close(); // Comparison operators useful for checking connection equality. - bool operator == (const Reader& other) const { return data == other.data; } - bool operator != (const Reader& other) const { return !(*this == other); } + bool operator==(const Reader& other) const { return data == other.data; } + bool operator!=(const Reader& other) const { return !(*this == other); } private: friend class Pipe; @@ -221,9 +221,8 @@ public: Future<Nothing> readerClosed() const; // Comparison operators useful for checking connection equality. - bool operator == (const Writer& other) const { return data == other.data; } - bool operator != (const Writer& other) const { return !(*this == other); } - + bool operator==(const Writer& other) const { return data == other.data; } + bool operator!=(const Writer& other) const { return !(*this == other); } private: friend class Pipe; @@ -245,9 +244,8 @@ public: Writer writer() const; // Comparison operators useful for checking connection equality. - bool operator == (const Pipe& other) const { return data == other.data; } - bool operator != (const Pipe& other) const { return !(*this == other); } - + bool operator==(const Pipe& other) const { return data == other.data; } + bool operator!=(const Pipe& other) const { return !(*this == other); } private: struct Data { @@ -695,9 +693,7 @@ struct URL }; -std::ostream& operator << ( - std::ostream& stream, - const URL& url); +std::ostream& operator<<(std::ostream& stream, const URL& url); // TODO(bmahler): Consolidate these functions into a single http://git-wip-us.apache.org/repos/asf/mesos/blob/5af9fb41/3rdparty/libprocess/include/process/latch.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/include/process/latch.hpp b/3rdparty/libprocess/include/process/latch.hpp index 460971e..a1a2227 100644 --- a/3rdparty/libprocess/include/process/latch.hpp +++ b/3rdparty/libprocess/include/process/latch.hpp @@ -27,8 +27,8 @@ public: Latch(); virtual ~Latch(); - bool operator == (const Latch& that) const { return pid == that.pid; } - bool operator < (const Latch& that) const { return pid < that.pid; } + bool operator==(const Latch& that) const { return pid == that.pid; } + bool operator<(const Latch& that) const { return pid < that.pid; } // Returns true if the latch was triggered, false if the latch had // already been triggered. @@ -41,7 +41,7 @@ public: private: // Not copyable, not assignable. Latch(const Latch& that); - Latch& operator = (const Latch& that); + Latch& operator=(const Latch& that); bool triggered; UPID pid; http://git-wip-us.apache.org/repos/asf/mesos/blob/5af9fb41/3rdparty/libprocess/include/process/limiter.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/include/process/limiter.hpp b/3rdparty/libprocess/include/process/limiter.hpp index ce69288..f2efe84 100644 --- a/3rdparty/libprocess/include/process/limiter.hpp +++ b/3rdparty/libprocess/include/process/limiter.hpp @@ -55,7 +55,7 @@ public: private: // Not copyable, not assignable. RateLimiter(const RateLimiter&); - RateLimiter& operator = (const RateLimiter&); + RateLimiter& operator=(const RateLimiter&); RateLimiterProcess* process; }; @@ -115,7 +115,7 @@ public: private: // Not copyable, not assignable. RateLimiterProcess(const RateLimiterProcess&); - RateLimiterProcess& operator = (const RateLimiterProcess&); + RateLimiterProcess& operator=(const RateLimiterProcess&); void _acquire() { http://git-wip-us.apache.org/repos/asf/mesos/blob/5af9fb41/3rdparty/libprocess/include/process/metrics/counter.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/include/process/metrics/counter.hpp b/3rdparty/libprocess/include/process/metrics/counter.hpp index 6ea3220..e51a8be 100644 --- a/3rdparty/libprocess/include/process/metrics/counter.hpp +++ b/3rdparty/libprocess/include/process/metrics/counter.hpp @@ -50,19 +50,19 @@ public: push(__sync_and_and_fetch(&data->v, 0)); } - Counter& operator ++ () // NOLINT(whitespace/operators) + Counter& operator++() { return *this += 1; } - Counter operator ++ (int) // NOLINT(whitespace/operators) + Counter operator++(int) { Counter c(*this); ++(*this); return c; } - Counter& operator += (int64_t v) + Counter& operator+=(int64_t v) { push(__sync_add_and_fetch(&data->v, v)); return *this; http://git-wip-us.apache.org/repos/asf/mesos/blob/5af9fb41/3rdparty/libprocess/include/process/metrics/metrics.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/include/process/metrics/metrics.hpp b/3rdparty/libprocess/include/process/metrics/metrics.hpp index 5a328d3..f2e84d8 100644 --- a/3rdparty/libprocess/include/process/metrics/metrics.hpp +++ b/3rdparty/libprocess/include/process/metrics/metrics.hpp @@ -56,7 +56,7 @@ private: // Non-copyable, non-assignable. MetricsProcess(const MetricsProcess&); - MetricsProcess& operator = (const MetricsProcess&); + MetricsProcess& operator=(const MetricsProcess&); Future<http::Response> snapshot(const http::Request& request); Future<http::Response> _snapshot(const http::Request& request); http://git-wip-us.apache.org/repos/asf/mesos/blob/5af9fb41/3rdparty/libprocess/include/process/once.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/include/process/once.hpp b/3rdparty/libprocess/include/process/once.hpp index 4b0cbe0..cbb1868 100644 --- a/3rdparty/libprocess/include/process/once.hpp +++ b/3rdparty/libprocess/include/process/once.hpp @@ -70,7 +70,7 @@ public: private: // Not copyable, not assignable. Once(const Once& that); - Once& operator = (const Once& that); + Once& operator=(const Once& that); std::mutex mutex; std::condition_variable cond; http://git-wip-us.apache.org/repos/asf/mesos/blob/5af9fb41/3rdparty/libprocess/include/process/owned.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/include/process/owned.hpp b/3rdparty/libprocess/include/process/owned.hpp index 428e922..bc5b527 100644 --- a/3rdparty/libprocess/include/process/owned.hpp +++ b/3rdparty/libprocess/include/process/owned.hpp @@ -39,11 +39,11 @@ public: Owned(); explicit Owned(T* t); - bool operator == (const Owned<T>& that) const; - bool operator < (const Owned<T>& that) const; + bool operator==(const Owned<T>& that) const; + bool operator<(const Owned<T>& that) const; - T& operator * () const; - T* operator -> () const; + T& operator*() const; + T* operator->() const; T* get() const; void reset(); @@ -85,28 +85,28 @@ Owned<T>::Owned(T* t) template <typename T> -bool Owned<T>::operator == (const Owned<T>& that) const +bool Owned<T>::operator==(const Owned<T>& that) const { return data == that.data; } template <typename T> -bool Owned<T>::operator < (const Owned<T>& that) const +bool Owned<T>::operator<(const Owned<T>& that) const { return data < that.data; } template <typename T> -T& Owned<T>::operator * () const +T& Owned<T>::operator*() const { return *CHECK_NOTNULL(get()); } template <typename T> -T* Owned<T>::operator -> () const +T* Owned<T>::operator->() const { return CHECK_NOTNULL(get()); } http://git-wip-us.apache.org/repos/asf/mesos/blob/5af9fb41/3rdparty/libprocess/include/process/pid.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/include/process/pid.hpp b/3rdparty/libprocess/include/process/pid.hpp index 3bce0bc..8d3735c 100644 --- a/3rdparty/libprocess/include/process/pid.hpp +++ b/3rdparty/libprocess/include/process/pid.hpp @@ -62,19 +62,19 @@ struct UPID /*implicit*/ UPID(const ProcessBase& process); - operator std::string () const; + operator std::string() const; - operator bool () const + operator bool() const { return id != "" && !address.ip.isAny() && address.port != 0; } - bool operator ! () const // NOLINT(whitespace/operators) + bool operator!() const // NOLINT(whitespace/operators) { return id == "" && address.ip.isAny() && address.port == 0; } - bool operator < (const UPID& that) const + bool operator<(const UPID& that) const { if (address == that.address) { return id < that.id; @@ -83,16 +83,15 @@ struct UPID } } - bool operator == (const UPID& that) const + bool operator==(const UPID& that) const { return (id == that.id && address == that.address); } - bool operator != (const UPID& that) const + bool operator!=(const UPID& that) const { return !(*this == that); } - std::string id; network::Address address; }; @@ -133,7 +132,7 @@ struct PID : UPID /*implicit*/ PID(const T& t) : UPID(static_cast<const ProcessBase&>(t)) {} template <typename Base> - operator PID<Base> () const + operator PID<Base>() const { // Only allow upcasts! T* t = NULL; @@ -148,8 +147,8 @@ struct PID : UPID // Outputing UPIDs and generating UPIDs using streams. -std::ostream& operator << (std::ostream&, const UPID&); -std::istream& operator >> (std::istream&, UPID&); +std::ostream& operator<<(std::ostream&, const UPID&); +std::istream& operator>>(std::istream&, UPID&); // UPID hash value (for example, to use in Boost's unordered maps). http://git-wip-us.apache.org/repos/asf/mesos/blob/5af9fb41/3rdparty/libprocess/include/process/protobuf.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/include/process/protobuf.hpp b/3rdparty/libprocess/include/process/protobuf.hpp index 3ec3775..91b51b0 100644 --- a/3rdparty/libprocess/include/process/protobuf.hpp +++ b/3rdparty/libprocess/include/process/protobuf.hpp @@ -865,7 +865,7 @@ private: template <typename Req, typename Res> struct Protocol { - process::Future<Res> operator () ( + process::Future<Res> operator()( const process::UPID& pid, const Req& req) const { http://git-wip-us.apache.org/repos/asf/mesos/blob/5af9fb41/3rdparty/libprocess/include/process/sequence.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/include/process/sequence.hpp b/3rdparty/libprocess/include/process/sequence.hpp index 2dec013..41da697 100644 --- a/3rdparty/libprocess/include/process/sequence.hpp +++ b/3rdparty/libprocess/include/process/sequence.hpp @@ -55,7 +55,7 @@ public: private: // Not copyable, not assignable. Sequence(const Sequence&); - Sequence& operator = (const Sequence&); + Sequence& operator=(const Sequence&); SequenceProcess* process; }; http://git-wip-us.apache.org/repos/asf/mesos/blob/5af9fb41/3rdparty/libprocess/include/process/shared.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/include/process/shared.hpp b/3rdparty/libprocess/include/process/shared.hpp index b4d90ca..021807b 100644 --- a/3rdparty/libprocess/include/process/shared.hpp +++ b/3rdparty/libprocess/include/process/shared.hpp @@ -36,12 +36,12 @@ public: Shared(); explicit Shared(T* t); - bool operator == (const Shared<T>& that) const; - bool operator < (const Shared<T>& that) const; + bool operator==(const Shared<T>& that) const; + bool operator<(const Shared<T>& that) const; // Enforces const access semantics. - const T& operator * () const; - const T* operator -> () const; + const T& operator*() const; + const T* operator->() const; const T* get() const; bool unique() const; @@ -86,28 +86,28 @@ Shared<T>::Shared(T* t) template <typename T> -bool Shared<T>::operator == (const Shared<T>& that) const +bool Shared<T>::operator==(const Shared<T>& that) const { return data == that.data; } template <typename T> -bool Shared<T>::operator < (const Shared<T>& that) const +bool Shared<T>::operator<(const Shared<T>& that) const { return data < that.data; } template <typename T> -const T& Shared<T>::operator * () const +const T& Shared<T>::operator*() const { return *CHECK_NOTNULL(get()); } template <typename T> -const T* Shared<T>::operator -> () const +const T* Shared<T>::operator->() const { return CHECK_NOTNULL(get()); } http://git-wip-us.apache.org/repos/asf/mesos/blob/5af9fb41/3rdparty/libprocess/include/process/socket.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/include/process/socket.hpp b/3rdparty/libprocess/include/process/socket.hpp index a882330..51a442a 100644 --- a/3rdparty/libprocess/include/process/socket.hpp +++ b/3rdparty/libprocess/include/process/socket.hpp @@ -220,12 +220,12 @@ public: int s; }; - bool operator == (const Socket& that) const + bool operator==(const Socket& that) const { return impl == that.impl; } - operator int () const + operator int() const { return impl->get(); } http://git-wip-us.apache.org/repos/asf/mesos/blob/5af9fb41/3rdparty/libprocess/include/process/time.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/include/process/time.hpp b/3rdparty/libprocess/include/process/time.hpp index 095409a..7cea8ec 100644 --- a/3rdparty/libprocess/include/process/time.hpp +++ b/3rdparty/libprocess/include/process/time.hpp @@ -39,38 +39,38 @@ public: double secs() const { return sinceEpoch.secs(); } - bool operator < (const Time& t) const { return sinceEpoch < t.sinceEpoch; } - bool operator <= (const Time& t) const { return sinceEpoch <= t.sinceEpoch; } - bool operator > (const Time& t) const { return sinceEpoch > t.sinceEpoch; } - bool operator >= (const Time& t) const { return sinceEpoch >= t.sinceEpoch; } - bool operator == (const Time& t) const { return sinceEpoch == t.sinceEpoch; } - bool operator != (const Time& t) const { return sinceEpoch != t.sinceEpoch; } - - Time& operator += (const Duration& d) + bool operator<(const Time& t) const { return sinceEpoch < t.sinceEpoch; } + bool operator<=(const Time& t) const { return sinceEpoch <= t.sinceEpoch; } + bool operator>(const Time& t) const { return sinceEpoch > t.sinceEpoch; } + bool operator>=(const Time& t) const { return sinceEpoch >= t.sinceEpoch; } + bool operator==(const Time& t) const { return sinceEpoch == t.sinceEpoch; } + bool operator!=(const Time& t) const { return sinceEpoch != t.sinceEpoch; } + + Time& operator+=(const Duration& d) { sinceEpoch += d; return *this; } - Time& operator -= (const Duration& d) + Time& operator-=(const Duration& d) { sinceEpoch -= d; return *this; } - Duration operator - (const Time& that) const + Duration operator-(const Time& that) const { return sinceEpoch - that.sinceEpoch; } - Time operator + (const Duration& duration) const + Time operator+(const Duration& duration) const { Time new_ = *this; new_ += duration; return new_; } - Time operator - (const Duration& duration) const + Time operator-(const Duration& duration) const { Time new_ = *this; new_ -= duration; @@ -104,13 +104,13 @@ public: explicit RFC1123(const Time& _time) : time(_time) {} private: - friend std::ostream& operator << (std::ostream& out, const RFC1123& format); + friend std::ostream& operator<<(std::ostream& out, const RFC1123& format); const Time time; }; -std::ostream& operator << (std::ostream& out, const RFC1123& formatter); +std::ostream& operator<<(std::ostream& out, const RFC1123& formatter); // Stream manipulator class which serializes Time objects in RFC 3339 @@ -122,17 +122,17 @@ public: explicit RFC3339(const Time& _time) : time(_time) {} private: - friend std::ostream& operator << (std::ostream& out, const RFC3339& format); + friend std::ostream& operator<<(std::ostream& out, const RFC3339& format); const Time time; }; -std::ostream& operator << (std::ostream& out, const RFC3339& formatter); +std::ostream& operator<<(std::ostream& out, const RFC3339& formatter); // Outputs the time in RFC 3339 Format. -inline std::ostream& operator << (std::ostream& stream, const Time& time) +inline std::ostream& operator<<(std::ostream& stream, const Time& time) { stream << RFC3339(time); return stream; http://git-wip-us.apache.org/repos/asf/mesos/blob/5af9fb41/3rdparty/libprocess/include/process/timeout.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/include/process/timeout.hpp b/3rdparty/libprocess/include/process/timeout.hpp index 868da49..a6ce8b6 100644 --- a/3rdparty/libprocess/include/process/timeout.hpp +++ b/3rdparty/libprocess/include/process/timeout.hpp @@ -39,7 +39,7 @@ public: return Timeout(Clock::now() + duration); } - Timeout& operator = (const Timeout& that) + Timeout& operator=(const Timeout& that) { if (this != &that) { timeout = that.timeout; @@ -48,23 +48,23 @@ public: return *this; } - Timeout& operator = (const Duration& duration) + Timeout& operator=(const Duration& duration) { timeout = Clock::now() + duration; return *this; } - bool operator == (const Timeout& that) const + bool operator==(const Timeout& that) const { return timeout == that.timeout; } - bool operator < (const Timeout& that) const + bool operator<(const Timeout& that) const { return timeout < that.timeout; } - bool operator <= (const Timeout& that) const + bool operator<=(const Timeout& that) const { return timeout <= that.timeout; } http://git-wip-us.apache.org/repos/asf/mesos/blob/5af9fb41/3rdparty/libprocess/include/process/timer.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/include/process/timer.hpp b/3rdparty/libprocess/include/process/timer.hpp index 02ebd32..4be0597 100644 --- a/3rdparty/libprocess/include/process/timer.hpp +++ b/3rdparty/libprocess/include/process/timer.hpp @@ -33,13 +33,13 @@ class Timer public: Timer() : id(0), pid(process::UPID()), thunk(&abort) {} - bool operator == (const Timer& that) const + bool operator==(const Timer& that) const { return id == that.id; } // Invokes this timer's thunk. - void operator () () const + void operator()() const { thunk(); } http://git-wip-us.apache.org/repos/asf/mesos/blob/5af9fb41/3rdparty/libprocess/src/http.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/src/http.cpp b/3rdparty/libprocess/src/http.cpp index b44c1f4..d8de44d 100644 --- a/3rdparty/libprocess/src/http.cpp +++ b/3rdparty/libprocess/src/http.cpp @@ -523,9 +523,7 @@ std::string encode(const hashmap<std::string, std::string>& query) } // namespace query { -ostream& operator << ( - ostream& stream, - const URL& url) +ostream& operator<<(ostream& stream, const URL& url) { stream << url.scheme << "://"; http://git-wip-us.apache.org/repos/asf/mesos/blob/5af9fb41/3rdparty/libprocess/src/pid.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/src/pid.cpp b/3rdparty/libprocess/src/pid.cpp index a5c5274..f5528ae 100644 --- a/3rdparty/libprocess/src/pid.cpp +++ b/3rdparty/libprocess/src/pid.cpp @@ -74,14 +74,14 @@ UPID::operator std::string() const } -ostream& operator << (ostream& stream, const UPID& pid) +ostream& operator<<(ostream& stream, const UPID& pid) { stream << pid.id << "@" << pid.address; return stream; } -istream& operator >> (istream& stream, UPID& pid) +istream& operator>>(istream& stream, UPID& pid) { pid.id = ""; pid.address.ip = net::IP(INADDR_ANY); http://git-wip-us.apache.org/repos/asf/mesos/blob/5af9fb41/3rdparty/libprocess/src/process_reference.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/src/process_reference.hpp b/3rdparty/libprocess/src/process_reference.hpp index c070158..f8df4a6 100644 --- a/3rdparty/libprocess/src/process_reference.hpp +++ b/3rdparty/libprocess/src/process_reference.hpp @@ -35,7 +35,7 @@ public: copy(that); } - ProcessReference& operator = (const ProcessReference& that) + ProcessReference& operator=(const ProcessReference& that) { if (this != &that) { cleanup(); @@ -44,17 +44,17 @@ public: return *this; } - ProcessBase* operator -> () + ProcessBase* operator->() { return process; } - operator ProcessBase* () + operator ProcessBase*() { return process; } - operator bool () const + operator bool() const { return process != NULL; } http://git-wip-us.apache.org/repos/asf/mesos/blob/5af9fb41/3rdparty/libprocess/src/test-master.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/src/test-master.cpp b/3rdparty/libprocess/src/test-master.cpp index 2a2ed0e..5ce9171 100644 --- a/3rdparty/libprocess/src/test-master.cpp +++ b/3rdparty/libprocess/src/test-master.cpp @@ -31,7 +31,7 @@ private: int id; protected: - void operator () () + void operator()() { do { switch (receive()) { http://git-wip-us.apache.org/repos/asf/mesos/blob/5af9fb41/3rdparty/libprocess/src/test-slave.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/src/test-slave.cpp b/3rdparty/libprocess/src/test-slave.cpp index 5a924a0..03fa8e6 100644 --- a/3rdparty/libprocess/src/test-slave.cpp +++ b/3rdparty/libprocess/src/test-slave.cpp @@ -23,7 +23,7 @@ private: int id; protected: - void operator () () + void operator()() { send(master, pack<REGISTER>("c3po")); http://git-wip-us.apache.org/repos/asf/mesos/blob/5af9fb41/3rdparty/libprocess/src/tests/process_tests.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/src/tests/process_tests.cpp b/3rdparty/libprocess/src/tests/process_tests.cpp index 95e3257..debc731 100644 --- a/3rdparty/libprocess/src/tests/process_tests.cpp +++ b/3rdparty/libprocess/src/tests/process_tests.cpp @@ -1831,8 +1831,8 @@ TEST(ProcessTest, Defers) struct Functor { - int operator () (string) const { return 42; } - int operator () () const { return 42; } + int operator()(string) const { return 42; } + int operator()() const { return 42; } } functor; Future<int> future13 = Future<string>().then( http://git-wip-us.apache.org/repos/asf/mesos/blob/5af9fb41/3rdparty/libprocess/src/time.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/src/time.cpp b/3rdparty/libprocess/src/time.cpp index 87f1f36..9130595 100644 --- a/3rdparty/libprocess/src/time.cpp +++ b/3rdparty/libprocess/src/time.cpp @@ -20,7 +20,7 @@ namespace process { -std::ostream& operator << (std::ostream& out, const RFC1123& formatter) +std::ostream& operator<<(std::ostream& out, const RFC1123& formatter) { time_t secs = static_cast<time_t>(formatter.time.secs()); @@ -76,7 +76,7 @@ std::ostream& operator << (std::ostream& out, const RFC1123& formatter) } -std::ostream& operator << (std::ostream& out, const RFC3339& formatter) +std::ostream& operator<<(std::ostream& out, const RFC3339& formatter) { // Round down the secs to use it with strftime and then append the // fraction part.
