Repository: mesos Updated Branches: refs/heads/master 50174e95b -> c75d887f9
Corrected #include header order for stout. Correct #include list errors for stout discovered by running a patched cpplint which has a fixed list of mesos vs. external library include directories. Review: https://reviews.apache.org/r/35861 Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/c75d887f Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/c75d887f Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/c75d887f Branch: refs/heads/master Commit: c75d887f9ad4ce0806882c2541c3dc3eff443f37 Parents: 50174e9 Author: Paul Brett <[email protected]> Authored: Fri Jun 26 10:52:11 2015 -0700 Committer: Vinod Kone <[email protected]> Committed: Fri Jun 26 14:24:45 2015 -0700 ---------------------------------------------------------------------- 3rdparty/libprocess/3rdparty/stout/include/stout/abort.hpp | 2 ++ 3rdparty/libprocess/3rdparty/stout/include/stout/cache.hpp | 5 +++-- .../libprocess/3rdparty/stout/include/stout/duration.hpp | 1 + .../3rdparty/stout/include/stout/dynamiclibrary.hpp | 2 ++ .../libprocess/3rdparty/stout/include/stout/flags/flags.hpp | 2 ++ 3rdparty/libprocess/3rdparty/stout/include/stout/format.hpp | 2 +- 3rdparty/libprocess/3rdparty/stout/include/stout/gtest.hpp | 4 ++-- .../libprocess/3rdparty/stout/include/stout/hashmap.hpp | 5 ++++- 3rdparty/libprocess/3rdparty/stout/include/stout/ip.hpp | 6 ++++-- 3rdparty/libprocess/3rdparty/stout/include/stout/os.hpp | 2 ++ .../libprocess/3rdparty/stout/include/stout/os/fork.hpp | 1 + .../libprocess/3rdparty/stout/include/stout/os/linux.hpp | 1 + 3rdparty/libprocess/3rdparty/stout/include/stout/os/osx.hpp | 2 ++ .../libprocess/3rdparty/stout/include/stout/os/read.hpp | 2 ++ .../libprocess/3rdparty/stout/include/stout/os/sunos.hpp | 6 ++++-- .../libprocess/3rdparty/stout/include/stout/os/sysctl.hpp | 8 ++++---- 3rdparty/libprocess/3rdparty/stout/include/stout/path.hpp | 1 + .../3rdparty/stout/include/stout/preprocessor.hpp | 2 +- .../libprocess/3rdparty/stout/include/stout/protobuf.hpp | 9 +++++---- .../libprocess/3rdparty/stout/include/stout/strings.hpp | 2 +- .../libprocess/3rdparty/stout/include/stout/tests/utils.hpp | 4 ++-- 3rdparty/libprocess/3rdparty/stout/include/stout/thread.hpp | 2 ++ 3rdparty/libprocess/3rdparty/stout/include/stout/utils.hpp | 2 ++ 3rdparty/libprocess/3rdparty/stout/include/stout/uuid.hpp | 2 +- .../libprocess/3rdparty/stout/include/stout/version.hpp | 2 ++ 3rdparty/libprocess/3rdparty/stout/tests/cache_tests.cpp | 4 ++-- 3rdparty/libprocess/3rdparty/stout/tests/error_tests.cpp | 4 ++-- 3rdparty/libprocess/3rdparty/stout/tests/flags_tests.cpp | 4 ++-- 3rdparty/libprocess/3rdparty/stout/tests/gzip_tests.cpp | 4 ++-- 3rdparty/libprocess/3rdparty/stout/tests/hashmap_tests.cpp | 1 + 3rdparty/libprocess/3rdparty/stout/tests/hashset_tests.cpp | 8 ++++---- 3rdparty/libprocess/3rdparty/stout/tests/json_tests.cpp | 8 ++++---- .../libprocess/3rdparty/stout/tests/linkedhashmap_tests.cpp | 4 ++-- 3rdparty/libprocess/3rdparty/stout/tests/multimap_tests.cpp | 6 +++--- 3rdparty/libprocess/3rdparty/stout/tests/none_tests.cpp | 4 ++-- 3rdparty/libprocess/3rdparty/stout/tests/option_tests.cpp | 4 +++- .../libprocess/3rdparty/stout/tests/os/sendfile_tests.cpp | 2 ++ .../libprocess/3rdparty/stout/tests/os/signals_tests.cpp | 2 ++ 3rdparty/libprocess/3rdparty/stout/tests/os_tests.cpp | 9 +++++---- 3rdparty/libprocess/3rdparty/stout/tests/path_tests.cpp | 4 ++-- 3rdparty/libprocess/3rdparty/stout/tests/proc_tests.cpp | 9 +++++---- 3rdparty/libprocess/3rdparty/stout/tests/protobuf_tests.cpp | 4 ++-- 3rdparty/libprocess/3rdparty/stout/tests/set_tests.cpp | 2 ++ 3rdparty/libprocess/3rdparty/stout/tests/some_tests.cpp | 4 ++-- 3rdparty/libprocess/3rdparty/stout/tests/strings_tests.cpp | 9 +++++---- .../libprocess/3rdparty/stout/tests/subcommand_tests.cpp | 2 +- 3rdparty/libprocess/3rdparty/stout/tests/svn_tests.cpp | 4 ++-- 3rdparty/libprocess/3rdparty/stout/tests/thread_tests.cpp | 4 ++-- 3rdparty/libprocess/3rdparty/stout/tests/uuid_tests.cpp | 4 ++-- 49 files changed, 115 insertions(+), 72 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/c75d887f/3rdparty/libprocess/3rdparty/stout/include/stout/abort.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/abort.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/abort.hpp index 4a26736..6a6f05b 100644 --- a/3rdparty/libprocess/3rdparty/stout/include/stout/abort.hpp +++ b/3rdparty/libprocess/3rdparty/stout/include/stout/abort.hpp @@ -20,6 +20,8 @@ #include <string.h> #include <unistd.h> +#include <string> + // Signal safe abort which prints a message. #define __STRINGIZE(x) #x #define _STRINGIZE(x) __STRINGIZE(x) http://git-wip-us.apache.org/repos/asf/mesos/blob/c75d887f/3rdparty/libprocess/3rdparty/stout/include/stout/cache.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/cache.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/cache.hpp index 9714d9a..9672018 100644 --- a/3rdparty/libprocess/3rdparty/stout/include/stout/cache.hpp +++ b/3rdparty/libprocess/3rdparty/stout/include/stout/cache.hpp @@ -14,15 +14,16 @@ #ifndef __STOUT_CACHE_HPP__ #define __STOUT_CACHE_HPP__ -#include <glog/logging.h> - #include <functional> #include <iostream> #include <list> #include <map> +#include <utility> #include <boost/unordered_map.hpp> +#include <glog/logging.h> + #include "none.hpp" #include "option.hpp" http://git-wip-us.apache.org/repos/asf/mesos/blob/c75d887f/3rdparty/libprocess/3rdparty/stout/include/stout/duration.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/duration.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/duration.hpp index ac823f1..bba8303 100644 --- a/3rdparty/libprocess/3rdparty/stout/include/stout/duration.hpp +++ b/3rdparty/libprocess/3rdparty/stout/include/stout/duration.hpp @@ -20,6 +20,7 @@ #include <iomanip> #include <iostream> +#include <limits> #include <string> #include "error.hpp" http://git-wip-us.apache.org/repos/asf/mesos/blob/c75d887f/3rdparty/libprocess/3rdparty/stout/include/stout/dynamiclibrary.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/dynamiclibrary.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/dynamiclibrary.hpp index 067be3a..5d0970f 100644 --- a/3rdparty/libprocess/3rdparty/stout/include/stout/dynamiclibrary.hpp +++ b/3rdparty/libprocess/3rdparty/stout/include/stout/dynamiclibrary.hpp @@ -16,6 +16,8 @@ #include <dlfcn.h> +#include <string> + #include <stout/nothing.hpp> #include <stout/option.hpp> #include <stout/try.hpp> http://git-wip-us.apache.org/repos/asf/mesos/blob/c75d887f/3rdparty/libprocess/3rdparty/stout/include/stout/flags/flags.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/flags/flags.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/flags/flags.hpp index 7527f72..3bb114b 100644 --- a/3rdparty/libprocess/3rdparty/stout/include/stout/flags/flags.hpp +++ b/3rdparty/libprocess/3rdparty/stout/include/stout/flags/flags.hpp @@ -14,10 +14,12 @@ #ifndef __STOUT_FLAGS_FLAGS_HPP__ #define __STOUT_FLAGS_FLAGS_HPP__ +#include <algorithm> #include <map> #include <ostream> #include <string> #include <typeinfo> // For typeid. +#include <vector> #include <stout/error.hpp> #include <stout/exit.hpp> http://git-wip-us.apache.org/repos/asf/mesos/blob/c75d887f/3rdparty/libprocess/3rdparty/stout/include/stout/format.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/format.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/format.hpp index 9bd19fd..4e8c3bd 100644 --- a/3rdparty/libprocess/3rdparty/stout/include/stout/format.hpp +++ b/3rdparty/libprocess/3rdparty/stout/include/stout/format.hpp @@ -21,8 +21,8 @@ #include <type_traits> // For 'is_pod'. #include "error.hpp" -#include "try.hpp" #include "stringify.hpp" +#include "try.hpp" // The 'strings::format' functions produces strings based on the http://git-wip-us.apache.org/repos/asf/mesos/blob/c75d887f/3rdparty/libprocess/3rdparty/stout/include/stout/gtest.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/gtest.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/gtest.hpp index 7c27513..f766359 100644 --- a/3rdparty/libprocess/3rdparty/stout/include/stout/gtest.hpp +++ b/3rdparty/libprocess/3rdparty/stout/include/stout/gtest.hpp @@ -14,10 +14,10 @@ #ifndef __STOUT_GTEST_HPP__ #define __STOUT_GTEST_HPP__ -#include <gtest/gtest.h> - #include <string> +#include <gtest/gtest.h> + #include <stout/option.hpp> #include <stout/result.hpp> #include <stout/try.hpp> http://git-wip-us.apache.org/repos/asf/mesos/blob/c75d887f/3rdparty/libprocess/3rdparty/stout/include/stout/hashmap.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/hashmap.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/hashmap.hpp index c967de9..ecab60a 100644 --- a/3rdparty/libprocess/3rdparty/stout/include/stout/hashmap.hpp +++ b/3rdparty/libprocess/3rdparty/stout/include/stout/hashmap.hpp @@ -14,13 +14,16 @@ #ifndef __STOUT_HASHMAP_HPP__ #define __STOUT_HASHMAP_HPP__ +#include <functional> +#include <list> +#include <map> #include <utility> #include <boost/get_pointer.hpp> #include <boost/unordered_map.hpp> -#include "hashset.hpp" #include "foreach.hpp" +#include "hashset.hpp" #include "none.hpp" #include "option.hpp" http://git-wip-us.apache.org/repos/asf/mesos/blob/c75d887f/3rdparty/libprocess/3rdparty/stout/include/stout/ip.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/ip.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/ip.hpp index 69cd81e..a0ea237 100644 --- a/3rdparty/libprocess/3rdparty/stout/include/stout/ip.hpp +++ b/3rdparty/libprocess/3rdparty/stout/include/stout/ip.hpp @@ -14,6 +14,8 @@ #ifndef __STOUT_IP_HPP__ #define __STOUT_IP_HPP__ +#include <arpa/inet.h> + #if defined(__linux__) || defined(__APPLE__) #include <ifaddrs.h> #endif @@ -21,8 +23,6 @@ #include <stdio.h> #include <string.h> -#include <arpa/inet.h> - #ifdef __APPLE__ #include <net/if.h> #include <net/if_dl.h> @@ -36,6 +36,8 @@ #include <iostream> #include <string> +#include <vector> + #include "abort.hpp" #include "bits.hpp" http://git-wip-us.apache.org/repos/asf/mesos/blob/c75d887f/3rdparty/libprocess/3rdparty/stout/include/stout/os.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/os.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/os.hpp index c283b76..818560f 100644 --- a/3rdparty/libprocess/3rdparty/stout/include/stout/os.hpp +++ b/3rdparty/libprocess/3rdparty/stout/include/stout/os.hpp @@ -55,8 +55,10 @@ #include <list> #include <map> +#include <queue> #include <set> #include <string> +#include <vector> #include <stout/bytes.hpp> #include <stout/duration.hpp> http://git-wip-us.apache.org/repos/asf/mesos/blob/c75d887f/3rdparty/libprocess/3rdparty/stout/include/stout/os/fork.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/os/fork.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/os/fork.hpp index d72b4c1..c6cfb60 100644 --- a/3rdparty/libprocess/3rdparty/stout/include/stout/os/fork.hpp +++ b/3rdparty/libprocess/3rdparty/stout/include/stout/os/fork.hpp @@ -25,6 +25,7 @@ #include <memory> #include <set> #include <string> +#include <vector> #include <stout/abort.hpp> #include <stout/error.hpp> http://git-wip-us.apache.org/repos/asf/mesos/blob/c75d887f/3rdparty/libprocess/3rdparty/stout/include/stout/os/linux.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/os/linux.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/os/linux.hpp index 0850ae9..5570d62 100644 --- a/3rdparty/libprocess/3rdparty/stout/include/stout/os/linux.hpp +++ b/3rdparty/libprocess/3rdparty/stout/include/stout/os/linux.hpp @@ -24,6 +24,7 @@ #include <list> #include <queue> #include <set> +#include <string> #include <stout/error.hpp> #include <stout/foreach.hpp> http://git-wip-us.apache.org/repos/asf/mesos/blob/c75d887f/3rdparty/libprocess/3rdparty/stout/include/stout/os/osx.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/os/osx.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/os/osx.hpp index c8d30d8..784104f 100644 --- a/3rdparty/libprocess/3rdparty/stout/include/stout/os/osx.hpp +++ b/3rdparty/libprocess/3rdparty/stout/include/stout/os/osx.hpp @@ -26,6 +26,8 @@ #include <queue> #include <set> +#include <string> +#include <vector> #include <stout/error.hpp> #include <stout/none.hpp> http://git-wip-us.apache.org/repos/asf/mesos/blob/c75d887f/3rdparty/libprocess/3rdparty/stout/include/stout/os/read.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/os/read.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/os/read.hpp index 59cde89..fed005e 100644 --- a/3rdparty/libprocess/3rdparty/stout/include/stout/os/read.hpp +++ b/3rdparty/libprocess/3rdparty/stout/include/stout/os/read.hpp @@ -17,6 +17,8 @@ #include <stdio.h> #include <unistd.h> +#include <string> + #ifdef __sun #include <fstream> #endif // __sun http://git-wip-us.apache.org/repos/asf/mesos/blob/c75d887f/3rdparty/libprocess/3rdparty/stout/include/stout/os/sunos.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/os/sunos.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/os/sunos.hpp index cfe6d74..dfb2d94 100644 --- a/3rdparty/libprocess/3rdparty/stout/include/stout/os/sunos.hpp +++ b/3rdparty/libprocess/3rdparty/stout/include/stout/os/sunos.hpp @@ -19,11 +19,13 @@ #error "stout/os/sunos.hpp is only available on Solaris systems." #endif -#include <sys/types.h> // For pid_t. #include <fcntl.h> #include <procfs.h> +#include <sys/types.h> // For pid_t. +#include <list> #include <set> +#include <string> #include <stout/error.hpp> #include <stout/foreach.hpp> @@ -31,8 +33,8 @@ #include <stout/result.hpp> #include <stout/try.hpp> -#include <stout/os/process.hpp> #include <stout/os/open.hpp> +#include <stout/os/process.hpp> namespace os { http://git-wip-us.apache.org/repos/asf/mesos/blob/c75d887f/3rdparty/libprocess/3rdparty/stout/include/stout/os/sysctl.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/os/sysctl.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/os/sysctl.hpp index a1e6e4d..0e94e22 100644 --- a/3rdparty/libprocess/3rdparty/stout/include/stout/os/sysctl.hpp +++ b/3rdparty/libprocess/3rdparty/stout/include/stout/os/sysctl.hpp @@ -19,12 +19,12 @@ #error "stout/os/sysctl.hpp is only available on OS X." #endif -#include <string> -#include <vector> - +#include <sys/sysctl.h> #include <sys/time.h> #include <sys/types.h> -#include <sys/sysctl.h> + +#include <string> +#include <vector> #include <stout/error.hpp> #include <stout/none.hpp> http://git-wip-us.apache.org/repos/asf/mesos/blob/c75d887f/3rdparty/libprocess/3rdparty/stout/include/stout/path.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/path.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/path.hpp index aa0d127..a4afdad 100644 --- a/3rdparty/libprocess/3rdparty/stout/include/stout/path.hpp +++ b/3rdparty/libprocess/3rdparty/stout/include/stout/path.hpp @@ -16,6 +16,7 @@ #include <string> #include <utility> +#include <vector> #include <stout/strings.hpp> http://git-wip-us.apache.org/repos/asf/mesos/blob/c75d887f/3rdparty/libprocess/3rdparty/stout/include/stout/preprocessor.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/preprocessor.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/preprocessor.hpp index e5f2037..11ec3d5 100644 --- a/3rdparty/libprocess/3rdparty/stout/include/stout/preprocessor.hpp +++ b/3rdparty/libprocess/3rdparty/stout/include/stout/preprocessor.hpp @@ -20,8 +20,8 @@ #include <boost/preprocessor/facilities/intercept.hpp> -#include <boost/preprocessor/repetition/enum_params.hpp> #include <boost/preprocessor/repetition/enum_binary_params.hpp> +#include <boost/preprocessor/repetition/enum_params.hpp> #include <boost/preprocessor/repetition/enum_trailing_params.hpp> #include <boost/preprocessor/repetition/repeat.hpp> #include <boost/preprocessor/repetition/repeat_from_to.hpp> http://git-wip-us.apache.org/repos/asf/mesos/blob/c75d887f/3rdparty/libprocess/3rdparty/stout/include/stout/protobuf.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/protobuf.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/protobuf.hpp index 2c020d9..8c75f6b 100644 --- a/3rdparty/libprocess/3rdparty/stout/include/stout/protobuf.hpp +++ b/3rdparty/libprocess/3rdparty/stout/include/stout/protobuf.hpp @@ -21,6 +21,11 @@ #include <sys/types.h> +#include <string> +#include <vector> + +#include <boost/lexical_cast.hpp> + #include <glog/logging.h> #include <google/protobuf/descriptor.h> @@ -29,10 +34,6 @@ #include <google/protobuf/io/zero_copy_stream_impl.h> -#include <string> - -#include <boost/lexical_cast.hpp> - #include "abort.hpp" #include "error.hpp" #include "json.hpp" http://git-wip-us.apache.org/repos/asf/mesos/blob/c75d887f/3rdparty/libprocess/3rdparty/stout/include/stout/strings.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/strings.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/strings.hpp index 702ed0b..963029b 100644 --- a/3rdparty/libprocess/3rdparty/stout/include/stout/strings.hpp +++ b/3rdparty/libprocess/3rdparty/stout/include/stout/strings.hpp @@ -15,9 +15,9 @@ #define __STOUT_STRINGS_HPP__ #include <algorithm> +#include <map> #include <sstream> #include <string> -#include <map> #include <vector> #include "foreach.hpp" http://git-wip-us.apache.org/repos/asf/mesos/blob/c75d887f/3rdparty/libprocess/3rdparty/stout/include/stout/tests/utils.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/tests/utils.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/tests/utils.hpp index 494baca..8934ba7 100644 --- a/3rdparty/libprocess/3rdparty/stout/include/stout/tests/utils.hpp +++ b/3rdparty/libprocess/3rdparty/stout/include/stout/tests/utils.hpp @@ -15,10 +15,10 @@ #ifndef __STOUT_TESTS_UTILS_HPP__ #define __STOUT_TESTS_UTILS_HPP__ -#include <gtest/gtest.h> - #include <string> +#include <gtest/gtest.h> + #include <stout/gtest.hpp> #include <stout/os.hpp> #include <stout/try.hpp> http://git-wip-us.apache.org/repos/asf/mesos/blob/c75d887f/3rdparty/libprocess/3rdparty/stout/include/stout/thread.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/thread.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/thread.hpp index 892246b..552d6e9 100644 --- a/3rdparty/libprocess/3rdparty/stout/include/stout/thread.hpp +++ b/3rdparty/libprocess/3rdparty/stout/include/stout/thread.hpp @@ -18,6 +18,8 @@ #include <pthread.h> #include <stdio.h> // For perror. +#include <string> + #include <stout/abort.hpp> template <typename T> http://git-wip-us.apache.org/repos/asf/mesos/blob/c75d887f/3rdparty/libprocess/3rdparty/stout/include/stout/utils.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/utils.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/utils.hpp index 09a1dcd..dfcd62a 100644 --- a/3rdparty/libprocess/3rdparty/stout/include/stout/utils.hpp +++ b/3rdparty/libprocess/3rdparty/stout/include/stout/utils.hpp @@ -14,6 +14,8 @@ #ifndef __STOUT_UTILS_HPP__ #define __STOUT_UTILS_HPP__ +#include <algorithm> + namespace utils { template <typename T> http://git-wip-us.apache.org/repos/asf/mesos/blob/c75d887f/3rdparty/libprocess/3rdparty/stout/include/stout/uuid.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/uuid.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/uuid.hpp index c6bf1a8..e8ebe0b 100644 --- a/3rdparty/libprocess/3rdparty/stout/include/stout/uuid.hpp +++ b/3rdparty/libprocess/3rdparty/stout/include/stout/uuid.hpp @@ -20,8 +20,8 @@ #include <string> #include <boost/uuid/uuid.hpp> -#include <boost/uuid/uuid_io.hpp> #include <boost/uuid/uuid_generators.hpp> +#include <boost/uuid/uuid_io.hpp> struct UUID : boost::uuids::uuid { http://git-wip-us.apache.org/repos/asf/mesos/blob/c75d887f/3rdparty/libprocess/3rdparty/stout/include/stout/version.hpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/include/stout/version.hpp b/3rdparty/libprocess/3rdparty/stout/include/stout/version.hpp index 090fcf0..8692323 100644 --- a/3rdparty/libprocess/3rdparty/stout/include/stout/version.hpp +++ b/3rdparty/libprocess/3rdparty/stout/include/stout/version.hpp @@ -15,6 +15,8 @@ #define __STOUT_VERSION_HPP__ #include <ostream> +#include <string> +#include <vector> #include <stout/error.hpp> #include <stout/numify.hpp> http://git-wip-us.apache.org/repos/asf/mesos/blob/c75d887f/3rdparty/libprocess/3rdparty/stout/tests/cache_tests.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/tests/cache_tests.cpp b/3rdparty/libprocess/3rdparty/stout/tests/cache_tests.cpp index 3065278..f8a0ba5 100644 --- a/3rdparty/libprocess/3rdparty/stout/tests/cache_tests.cpp +++ b/3rdparty/libprocess/3rdparty/stout/tests/cache_tests.cpp @@ -1,7 +1,7 @@ -#include <gtest/gtest.h> - #include <string> +#include <gtest/gtest.h> + #include <stout/cache.hpp> #include <stout/gtest.hpp> http://git-wip-us.apache.org/repos/asf/mesos/blob/c75d887f/3rdparty/libprocess/3rdparty/stout/tests/error_tests.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/tests/error_tests.cpp b/3rdparty/libprocess/3rdparty/stout/tests/error_tests.cpp index d86b0ea..35a62b1 100644 --- a/3rdparty/libprocess/3rdparty/stout/tests/error_tests.cpp +++ b/3rdparty/libprocess/3rdparty/stout/tests/error_tests.cpp @@ -1,9 +1,9 @@ +#include <string> + #include <gtest/gtest.h> #include <gmock/gmock.h> -#include <string> - #include <stout/error.hpp> #include <stout/gtest.hpp> #include <stout/option.hpp> http://git-wip-us.apache.org/repos/asf/mesos/blob/c75d887f/3rdparty/libprocess/3rdparty/stout/tests/flags_tests.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/tests/flags_tests.cpp b/3rdparty/libprocess/3rdparty/stout/tests/flags_tests.cpp index c2c6a6a..c2f6c22 100644 --- a/3rdparty/libprocess/3rdparty/stout/tests/flags_tests.cpp +++ b/3rdparty/libprocess/3rdparty/stout/tests/flags_tests.cpp @@ -1,8 +1,8 @@ -#include <gmock/gmock.h> - #include <map> #include <string> +#include <gmock/gmock.h> + #include <stout/duration.hpp> #include <stout/flags.hpp> #include <stout/foreach.hpp> http://git-wip-us.apache.org/repos/asf/mesos/blob/c75d887f/3rdparty/libprocess/3rdparty/stout/tests/gzip_tests.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/tests/gzip_tests.cpp b/3rdparty/libprocess/3rdparty/stout/tests/gzip_tests.cpp index 13296d8..2211f31 100644 --- a/3rdparty/libprocess/3rdparty/stout/tests/gzip_tests.cpp +++ b/3rdparty/libprocess/3rdparty/stout/tests/gzip_tests.cpp @@ -1,9 +1,9 @@ +#include <string> + #include <gtest/gtest.h> #include <gmock/gmock.h> -#include <string> - #include <stout/gtest.hpp> #include <stout/gzip.hpp> http://git-wip-us.apache.org/repos/asf/mesos/blob/c75d887f/3rdparty/libprocess/3rdparty/stout/tests/hashmap_tests.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/tests/hashmap_tests.cpp b/3rdparty/libprocess/3rdparty/stout/tests/hashmap_tests.cpp index 19a0f58..4a8176b 100644 --- a/3rdparty/libprocess/3rdparty/stout/tests/hashmap_tests.cpp +++ b/3rdparty/libprocess/3rdparty/stout/tests/hashmap_tests.cpp @@ -1,5 +1,6 @@ #include <ctype.h> +#include <map> #include <string> #include <gmock/gmock.h> http://git-wip-us.apache.org/repos/asf/mesos/blob/c75d887f/3rdparty/libprocess/3rdparty/stout/tests/hashset_tests.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/tests/hashset_tests.cpp b/3rdparty/libprocess/3rdparty/stout/tests/hashset_tests.cpp index 3c4b732..97a7167 100644 --- a/3rdparty/libprocess/3rdparty/stout/tests/hashset_tests.cpp +++ b/3rdparty/libprocess/3rdparty/stout/tests/hashset_tests.cpp @@ -1,11 +1,11 @@ -#include <gtest/gtest.h> - -#include <gmock/gmock.h> - #include <string> #include <stout/hashset.hpp> +#include <gtest/gtest.h> + +#include <gmock/gmock.h> + using std::string; http://git-wip-us.apache.org/repos/asf/mesos/blob/c75d887f/3rdparty/libprocess/3rdparty/stout/tests/json_tests.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/tests/json_tests.cpp b/3rdparty/libprocess/3rdparty/stout/tests/json_tests.cpp index 5ade9bd..0011f08 100644 --- a/3rdparty/libprocess/3rdparty/stout/tests/json_tests.cpp +++ b/3rdparty/libprocess/3rdparty/stout/tests/json_tests.cpp @@ -1,13 +1,13 @@ -#include <gtest/gtest.h> - -#include <gmock/gmock.h> - #include <stdint.h> #include <sys/stat.h> #include <string> +#include <gtest/gtest.h> + +#include <gmock/gmock.h> + #include <stout/gtest.hpp> #include <stout/json.hpp> #include <stout/stringify.hpp> http://git-wip-us.apache.org/repos/asf/mesos/blob/c75d887f/3rdparty/libprocess/3rdparty/stout/tests/linkedhashmap_tests.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/tests/linkedhashmap_tests.cpp b/3rdparty/libprocess/3rdparty/stout/tests/linkedhashmap_tests.cpp index 685a9a1..0644d99 100644 --- a/3rdparty/libprocess/3rdparty/stout/tests/linkedhashmap_tests.cpp +++ b/3rdparty/libprocess/3rdparty/stout/tests/linkedhashmap_tests.cpp @@ -1,10 +1,10 @@ #include <stdint.h> -#include <gtest/gtest.h> - #include <list> #include <string> +#include <gtest/gtest.h> + #include <stout/gtest.hpp> #include <stout/linkedhashmap.hpp> http://git-wip-us.apache.org/repos/asf/mesos/blob/c75d887f/3rdparty/libprocess/3rdparty/stout/tests/multimap_tests.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/tests/multimap_tests.cpp b/3rdparty/libprocess/3rdparty/stout/tests/multimap_tests.cpp index 79e7200..11f3bf7 100644 --- a/3rdparty/libprocess/3rdparty/stout/tests/multimap_tests.cpp +++ b/3rdparty/libprocess/3rdparty/stout/tests/multimap_tests.cpp @@ -1,13 +1,13 @@ #include <stdint.h> -#include <gtest/gtest.h> - #include <set> #include <string> +#include <gtest/gtest.h> + #include <stout/foreach.hpp> -#include <stout/multimap.hpp> #include <stout/multihashmap.hpp> +#include <stout/multimap.hpp> using std::set; using std::string; http://git-wip-us.apache.org/repos/asf/mesos/blob/c75d887f/3rdparty/libprocess/3rdparty/stout/tests/none_tests.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/tests/none_tests.cpp b/3rdparty/libprocess/3rdparty/stout/tests/none_tests.cpp index 38d25bb..1c1f8be 100644 --- a/3rdparty/libprocess/3rdparty/stout/tests/none_tests.cpp +++ b/3rdparty/libprocess/3rdparty/stout/tests/none_tests.cpp @@ -1,9 +1,9 @@ +#include <string> + #include <gtest/gtest.h> #include <gmock/gmock.h> -#include <string> - #include <stout/none.hpp> #include <stout/option.hpp> #include <stout/result.hpp> http://git-wip-us.apache.org/repos/asf/mesos/blob/c75d887f/3rdparty/libprocess/3rdparty/stout/tests/option_tests.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/tests/option_tests.cpp b/3rdparty/libprocess/3rdparty/stout/tests/option_tests.cpp index 0e5d451..d87cf22 100644 --- a/3rdparty/libprocess/3rdparty/stout/tests/option_tests.cpp +++ b/3rdparty/libprocess/3rdparty/stout/tests/option_tests.cpp @@ -1,6 +1,8 @@ +#include <algorithm> +#include <string> + #include <gmock/gmock.h> -#include <string> #include <stout/gtest.hpp> #include <stout/none.hpp> #include <stout/option.hpp> http://git-wip-us.apache.org/repos/asf/mesos/blob/c75d887f/3rdparty/libprocess/3rdparty/stout/tests/os/sendfile_tests.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/tests/os/sendfile_tests.cpp b/3rdparty/libprocess/3rdparty/stout/tests/os/sendfile_tests.cpp index 3d1b966..fee942c 100644 --- a/3rdparty/libprocess/3rdparty/stout/tests/os/sendfile_tests.cpp +++ b/3rdparty/libprocess/3rdparty/stout/tests/os/sendfile_tests.cpp @@ -1,3 +1,5 @@ +#include <string> + #include <gmock/gmock.h> #include <gtest/gtest.h> http://git-wip-us.apache.org/repos/asf/mesos/blob/c75d887f/3rdparty/libprocess/3rdparty/stout/tests/os/signals_tests.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/tests/os/signals_tests.cpp b/3rdparty/libprocess/3rdparty/stout/tests/os/signals_tests.cpp index d07b95c..6d2d3d5 100644 --- a/3rdparty/libprocess/3rdparty/stout/tests/os/signals_tests.cpp +++ b/3rdparty/libprocess/3rdparty/stout/tests/os/signals_tests.cpp @@ -1,5 +1,7 @@ #include <errno.h> +#include <string> + #include <gmock/gmock.h> #include <gtest/gtest.h> http://git-wip-us.apache.org/repos/asf/mesos/blob/c75d887f/3rdparty/libprocess/3rdparty/stout/tests/os_tests.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/tests/os_tests.cpp b/3rdparty/libprocess/3rdparty/stout/tests/os_tests.cpp index 7327ad2..4a01d94 100644 --- a/3rdparty/libprocess/3rdparty/stout/tests/os_tests.cpp +++ b/3rdparty/libprocess/3rdparty/stout/tests/os_tests.cpp @@ -1,7 +1,3 @@ -#include <gmock/gmock.h> - -#include <gtest/gtest.h> - #include <stdint.h> #ifndef __linux__ @@ -14,6 +10,11 @@ #include <set> #include <sstream> #include <string> +#include <vector> + +#include <gmock/gmock.h> + +#include <gtest/gtest.h> #include <stout/duration.hpp> #include <stout/foreach.hpp> http://git-wip-us.apache.org/repos/asf/mesos/blob/c75d887f/3rdparty/libprocess/3rdparty/stout/tests/path_tests.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/tests/path_tests.cpp b/3rdparty/libprocess/3rdparty/stout/tests/path_tests.cpp index 3007c2a..3211a0d 100644 --- a/3rdparty/libprocess/3rdparty/stout/tests/path_tests.cpp +++ b/3rdparty/libprocess/3rdparty/stout/tests/path_tests.cpp @@ -11,11 +11,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include <gtest/gtest.h> - #include <string> #include <vector> +#include <gtest/gtest.h> + #include <stout/path.hpp> using std::string; http://git-wip-us.apache.org/repos/asf/mesos/blob/c75d887f/3rdparty/libprocess/3rdparty/stout/tests/proc_tests.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/tests/proc_tests.cpp b/3rdparty/libprocess/3rdparty/stout/tests/proc_tests.cpp index 60a94ab..dd3700d 100644 --- a/3rdparty/libprocess/3rdparty/stout/tests/proc_tests.cpp +++ b/3rdparty/libprocess/3rdparty/stout/tests/proc_tests.cpp @@ -1,11 +1,12 @@ -#include <iostream> - #include <pthread.h> #include <unistd.h> // For getpid, getppid. -#include <gmock/gmock.h> - +#include <iostream> +#include <list> #include <set> +#include <string> + +#include <gmock/gmock.h> #include <stout/abort.hpp> #include <stout/gtest.hpp> http://git-wip-us.apache.org/repos/asf/mesos/blob/c75d887f/3rdparty/libprocess/3rdparty/stout/tests/protobuf_tests.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/tests/protobuf_tests.cpp b/3rdparty/libprocess/3rdparty/stout/tests/protobuf_tests.cpp index 0651185..b3ce131 100644 --- a/3rdparty/libprocess/3rdparty/stout/tests/protobuf_tests.cpp +++ b/3rdparty/libprocess/3rdparty/stout/tests/protobuf_tests.cpp @@ -1,9 +1,9 @@ +#include <string> + #include <gtest/gtest.h> #include <gmock/gmock.h> -#include <string> - #include <stout/gtest.hpp> #include <stout/json.hpp> #include <stout/protobuf.hpp> http://git-wip-us.apache.org/repos/asf/mesos/blob/c75d887f/3rdparty/libprocess/3rdparty/stout/tests/set_tests.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/tests/set_tests.cpp b/3rdparty/libprocess/3rdparty/stout/tests/set_tests.cpp index cdedacd..3ddba94 100644 --- a/3rdparty/libprocess/3rdparty/stout/tests/set_tests.cpp +++ b/3rdparty/libprocess/3rdparty/stout/tests/set_tests.cpp @@ -1,3 +1,5 @@ +#include <set> + #include <gtest/gtest.h> #include <stout/set.hpp> http://git-wip-us.apache.org/repos/asf/mesos/blob/c75d887f/3rdparty/libprocess/3rdparty/stout/tests/some_tests.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/tests/some_tests.cpp b/3rdparty/libprocess/3rdparty/stout/tests/some_tests.cpp index 1e5f449..0689446 100644 --- a/3rdparty/libprocess/3rdparty/stout/tests/some_tests.cpp +++ b/3rdparty/libprocess/3rdparty/stout/tests/some_tests.cpp @@ -1,8 +1,8 @@ -#include <gtest/gtest.h> - #include <map> #include <string> +#include <gtest/gtest.h> + #include <stout/gtest.hpp> #include <stout/none.hpp> #include <stout/option.hpp> http://git-wip-us.apache.org/repos/asf/mesos/blob/c75d887f/3rdparty/libprocess/3rdparty/stout/tests/strings_tests.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/tests/strings_tests.cpp b/3rdparty/libprocess/3rdparty/stout/tests/strings_tests.cpp index b900579..9733b2e 100644 --- a/3rdparty/libprocess/3rdparty/stout/tests/strings_tests.cpp +++ b/3rdparty/libprocess/3rdparty/stout/tests/strings_tests.cpp @@ -1,11 +1,12 @@ -#include <gtest/gtest.h> - -#include <gmock/gmock.h> - #include <map> +#include <set> #include <string> #include <vector> +#include <gtest/gtest.h> + +#include <gmock/gmock.h> + #include <stout/format.hpp> #include <stout/gtest.hpp> #include <stout/strings.hpp> http://git-wip-us.apache.org/repos/asf/mesos/blob/c75d887f/3rdparty/libprocess/3rdparty/stout/tests/subcommand_tests.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/tests/subcommand_tests.cpp b/3rdparty/libprocess/3rdparty/stout/tests/subcommand_tests.cpp index c40bba4..4519b4d 100644 --- a/3rdparty/libprocess/3rdparty/stout/tests/subcommand_tests.cpp +++ b/3rdparty/libprocess/3rdparty/stout/tests/subcommand_tests.cpp @@ -12,8 +12,8 @@ * limitations under the License. */ -#include <string.h> #include <stdlib.h> +#include <string.h> #include <string> #include <vector> http://git-wip-us.apache.org/repos/asf/mesos/blob/c75d887f/3rdparty/libprocess/3rdparty/stout/tests/svn_tests.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/tests/svn_tests.cpp b/3rdparty/libprocess/3rdparty/stout/tests/svn_tests.cpp index d5e0f6e..2ac7a22 100644 --- a/3rdparty/libprocess/3rdparty/stout/tests/svn_tests.cpp +++ b/3rdparty/libprocess/3rdparty/stout/tests/svn_tests.cpp @@ -12,11 +12,11 @@ * limitations under the License. */ -#include <gtest/gtest.h> - #include <cstdlib> // For rand(). #include <string> +#include <gtest/gtest.h> + #include <stout/bytes.hpp> #include <stout/gtest.hpp> #include <stout/svn.hpp> http://git-wip-us.apache.org/repos/asf/mesos/blob/c75d887f/3rdparty/libprocess/3rdparty/stout/tests/thread_tests.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/tests/thread_tests.cpp b/3rdparty/libprocess/3rdparty/stout/tests/thread_tests.cpp index b37d7f4..93339eb 100644 --- a/3rdparty/libprocess/3rdparty/stout/tests/thread_tests.cpp +++ b/3rdparty/libprocess/3rdparty/stout/tests/thread_tests.cpp @@ -1,7 +1,7 @@ -#include <gtest/gtest.h> - #include <string> +#include <gtest/gtest.h> + #include <stout/thread.hpp> TEST(Thread, Local) http://git-wip-us.apache.org/repos/asf/mesos/blob/c75d887f/3rdparty/libprocess/3rdparty/stout/tests/uuid_tests.cpp ---------------------------------------------------------------------- diff --git a/3rdparty/libprocess/3rdparty/stout/tests/uuid_tests.cpp b/3rdparty/libprocess/3rdparty/stout/tests/uuid_tests.cpp index bcf7252..7ac8fc0 100644 --- a/3rdparty/libprocess/3rdparty/stout/tests/uuid_tests.cpp +++ b/3rdparty/libprocess/3rdparty/stout/tests/uuid_tests.cpp @@ -1,9 +1,9 @@ +#include <string> + #include <gtest/gtest.h> #include <gmock/gmock.h> -#include <string> - #include <stout/uuid.hpp> using std::string;
