Repository: mesos Updated Branches: refs/heads/master f1da58fb2 -> 8e5ab0e30
Normalized and enforced 3rdparty/libprocess conditional include style. Review: https://reviews.apache.org/r/26056 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/8e5ab0e3 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/8e5ab0e3 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/8e5ab0e3 Branch: refs/heads/master Commit: 8e5ab0e30dbf729d61b423d8693ccc231789b661 Parents: f1da58f Author: Joris Van Remoortere <[email protected]> Authored: Thu Sep 25 16:23:09 2014 -0700 Committer: Niklas Q. Nielsen <[email protected]> Committed: Thu Sep 25 16:37:43 2014 -0700 ---------------------------------------------------------------------- 3rdparty/libprocess/include/process/metrics/metrics.hpp | 2 +- 3rdparty/libprocess/include/process/tuples/details.hpp | 5 +++++ 3rdparty/libprocess/src/config.hpp | 6 +++--- 3rdparty/libprocess/src/fatal.hpp | 6 +++--- 3rdparty/libprocess/src/net.hpp | 6 +++--- 3rdparty/libprocess/src/process_reference.hpp | 6 +++--- 3rdparty/libprocess/src/synchronized.hpp | 5 +++++ 7 files changed, 23 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/8e5ab0e3/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 0a97f12..aa44992 100644 --- a/3rdparty/libprocess/include/process/metrics/metrics.hpp +++ b/3rdparty/libprocess/include/process/metrics/metrics.hpp @@ -87,4 +87,4 @@ inline Future<Nothing> remove(const Metric& metric) } // namespace metrics { } // namespace process { -#endif // __PROCESS_METRICS_METRICS_HPP__ +#endif // __PROCESS_METRICS_METRICS_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/8e5ab0e3/3rdparty/libprocess/include/process/tuples/details.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/include/process/tuples/details.hpp b/3rdparty/libprocess/include/process/tuples/details.hpp index 80b0539..f198f0e 100644 --- a/3rdparty/libprocess/include/process/tuples/details.hpp +++ b/3rdparty/libprocess/include/process/tuples/details.hpp @@ -1,3 +1,6 @@ +#ifndef __PROCESS_DETAILS_HPP__ +#define __PROCESS_DETAILS_HPP__ + template <MSGID ID> class tuple; #undef IDENTITY @@ -168,3 +171,5 @@ typename boost::tuples::element<N, tuple<ID> >::type unpack( { return boost::tuples::get<N>(unpack<ID>(data)); } + +#endif // __PROCESS_DETAILS_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/8e5ab0e3/3rdparty/libprocess/src/config.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/src/config.hpp b/3rdparty/libprocess/src/config.hpp index cbaf41d..d5084bf 100644 --- a/3rdparty/libprocess/src/config.hpp +++ b/3rdparty/libprocess/src/config.hpp @@ -1,5 +1,5 @@ -#ifndef CONFIG_HPP -#define CONFIG_HPP +#ifndef __CONFIG_HPP__ +#define __CONFIG_HPP__ #ifdef __sun__ #define gethostbyname2(name, _) gethostbyname(name) @@ -35,4 +35,4 @@ #endif #endif /* __linux__ */ -#endif /* CONFIG_HPP */ +#endif // __CONFIG_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/8e5ab0e3/3rdparty/libprocess/src/fatal.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/src/fatal.hpp b/3rdparty/libprocess/src/fatal.hpp index 38646f3..34314fd 100644 --- a/3rdparty/libprocess/src/fatal.hpp +++ b/3rdparty/libprocess/src/fatal.hpp @@ -4,8 +4,8 @@ * Contributed by Benjamin Hindman <[email protected]>, 2008. */ -#ifndef FATAL_HPP -#define FATAL_HPP +#ifndef __FATAL_HPP__ +#define __FATAL_HPP__ #include <stdarg.h> #include <stdio.h> @@ -25,4 +25,4 @@ void __fatal(const char *file, int line, const char *fmt, ...); #define fatalerror(fmt...) __fatalerror(__FILE__, __LINE__, fmt) void __fatalerror(const char *file, int line, const char *fmt, ...); -#endif /* FATAL_HPP */ +#endif // __FATAL_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/8e5ab0e3/3rdparty/libprocess/src/net.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/src/net.hpp b/3rdparty/libprocess/src/net.hpp index 1ba3dbb..7bf6085 100644 --- a/3rdparty/libprocess/src/net.hpp +++ b/3rdparty/libprocess/src/net.hpp @@ -1,7 +1,7 @@ /* TODO(benh): Write a form of 'Client' process. */ -#ifndef NET_HPP -#define NET_HPP +#ifndef __NET_HPP__ +#define __NET_HPP__ #include <assert.h> #include <errno.h> @@ -229,4 +229,4 @@ public: }; -#endif /* NET_HH */ +#endif // __NET_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/8e5ab0e3/3rdparty/libprocess/src/process_reference.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/src/process_reference.hpp b/3rdparty/libprocess/src/process_reference.hpp index 4964107..eea9e4b 100644 --- a/3rdparty/libprocess/src/process_reference.hpp +++ b/3rdparty/libprocess/src/process_reference.hpp @@ -1,5 +1,5 @@ -#ifndef PROCESS_REFERENCE_HPP -#define PROCESS_REFERENCE_HPP +#ifndef __PROCESS_REFERENCE_HPP__ +#define __PROCESS_REFERENCE_HPP__ #include <process/process.hpp> @@ -81,4 +81,4 @@ private: } // namespace process { -#endif // PROCESS_REFERENCE_HPP +#endif // __PROCESS_REFERENCE_HPP__ http://git-wip-us.apache.org/repos/asf/mesos/blob/8e5ab0e3/3rdparty/libprocess/src/synchronized.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/src/synchronized.hpp b/3rdparty/libprocess/src/synchronized.hpp index 577a5fc..70f6cd0 100644 --- a/3rdparty/libprocess/src/synchronized.hpp +++ b/3rdparty/libprocess/src/synchronized.hpp @@ -1,3 +1,6 @@ +#ifndef __SYNCHRONIZABLE_HPP__ +#define __SYNCHRONIZABLE_HPP__ + #include <pthread.h> #include <iostream> @@ -107,3 +110,5 @@ private: #define SYNCHRONIZED_INITIALIZER_RECURSIVE \ Synchronizable(PTHREAD_MUTEX_RECURSIVE) + +#endif // __SYNCHRONIZABLE_HPP__
