Fixed header inclusions for `csi/spec.hpp`. Review: https://reviews.apache.org/r/66157
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/eece6195 Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/eece6195 Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/eece6195 Branch: refs/heads/master Commit: eece61950982a6b7b18822a469edaad7f0f33d01 Parents: 59cca96 Author: Chun-Hung Hsiao <chhs...@mesosphere.io> Authored: Fri Mar 16 17:34:49 2018 -0700 Committer: Chun-Hung Hsiao <chhs...@mesosphere.io> Committed: Wed Mar 21 12:23:13 2018 -0700 ---------------------------------------------------------------------- src/csi/client.hpp | 4 ++-- src/csi/utils.hpp | 3 ++- src/examples/test_csi_plugin.cpp | 3 ++- src/resource_provider/storage/disk_profile.cpp | 4 ++-- src/resource_provider/storage/uri_disk_profile.cpp | 5 +++-- src/resource_provider/storage/uri_disk_profile.hpp | 4 ++-- src/tests/mock_csi_plugin.hpp | 4 ++-- 7 files changed, 15 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/mesos/blob/eece6195/src/csi/client.hpp ---------------------------------------------------------------------- diff --git a/src/csi/client.hpp b/src/csi/client.hpp index 0ff97ee..6f180e1 100644 --- a/src/csi/client.hpp +++ b/src/csi/client.hpp @@ -19,10 +19,10 @@ #include <string> -#include <process/grpc.hpp> - #include <csi/spec.hpp> +#include <process/grpc.hpp> + namespace mesos { namespace csi { http://git-wip-us.apache.org/repos/asf/mesos/blob/eece6195/src/csi/utils.hpp ---------------------------------------------------------------------- diff --git a/src/csi/utils.hpp b/src/csi/utils.hpp index 2dd61bc..58b071d 100644 --- a/src/csi/utils.hpp +++ b/src/csi/utils.hpp @@ -20,6 +20,8 @@ #include <ostream> #include <type_traits> +#include <csi/spec.hpp> + #include <google/protobuf/map.h> #include <google/protobuf/util/json_util.h> @@ -30,7 +32,6 @@ #include <stout/try.hpp> #include <stout/unreachable.hpp> -#include "csi/spec.hpp" #include "csi/state.hpp" namespace csi { http://git-wip-us.apache.org/repos/asf/mesos/blob/eece6195/src/examples/test_csi_plugin.cpp ---------------------------------------------------------------------- diff --git a/src/examples/test_csi_plugin.cpp b/src/examples/test_csi_plugin.cpp index 1779338..aed2262 100644 --- a/src/examples/test_csi_plugin.cpp +++ b/src/examples/test_csi_plugin.cpp @@ -14,6 +14,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +#include <csi/spec.hpp> + #include <grpcpp/server.h> #include <grpcpp/server_builder.h> #include <grpcpp/server_context.h> @@ -32,7 +34,6 @@ #include <stout/os/mkdir.hpp> #include <stout/os/rmdir.hpp> -#include "csi/spec.hpp" #include "csi/utils.hpp" #include "linux/fs.hpp" http://git-wip-us.apache.org/repos/asf/mesos/blob/eece6195/src/resource_provider/storage/disk_profile.cpp ---------------------------------------------------------------------- diff --git a/src/resource_provider/storage/disk_profile.cpp b/src/resource_provider/storage/disk_profile.cpp index ba195cb..df933c1 100644 --- a/src/resource_provider/storage/disk_profile.cpp +++ b/src/resource_provider/storage/disk_profile.cpp @@ -16,6 +16,8 @@ #include <string> +#include <csi/spec.hpp> + #include <mesos/module/disk_profile.hpp> #include <mesos/resource_provider/storage/disk_profile.hpp> @@ -24,8 +26,6 @@ #include <stout/hashset.hpp> -#include <csi/spec.hpp> - #include "module/manager.hpp" using std::string; http://git-wip-us.apache.org/repos/asf/mesos/blob/eece6195/src/resource_provider/storage/uri_disk_profile.cpp ---------------------------------------------------------------------- diff --git a/src/resource_provider/storage/uri_disk_profile.cpp b/src/resource_provider/storage/uri_disk_profile.cpp index 665798f..ad90b89 100644 --- a/src/resource_provider/storage/uri_disk_profile.cpp +++ b/src/resource_provider/storage/uri_disk_profile.cpp @@ -20,6 +20,8 @@ #include <string> #include <tuple> +#include <csi/spec.hpp> + #include <mesos/module/disk_profile.hpp> #include <mesos/resource_provider/storage/disk_profile.hpp> @@ -39,8 +41,7 @@ #include <stout/result.hpp> #include <stout/strings.hpp> -#include <csi/spec.hpp> -#include <csi/utils.hpp> +#include "csi/utils.hpp" #include "resource_provider/storage/disk_profile_utils.hpp" http://git-wip-us.apache.org/repos/asf/mesos/blob/eece6195/src/resource_provider/storage/uri_disk_profile.hpp ---------------------------------------------------------------------- diff --git a/src/resource_provider/storage/uri_disk_profile.hpp b/src/resource_provider/storage/uri_disk_profile.hpp index 22e9d8b..e4e0f18 100644 --- a/src/resource_provider/storage/uri_disk_profile.hpp +++ b/src/resource_provider/storage/uri_disk_profile.hpp @@ -21,6 +21,8 @@ #include <string> #include <tuple> +#include <csi/spec.hpp> + #include <mesos/resource_provider/storage/disk_profile.hpp> #include <process/future.hpp> @@ -36,8 +38,6 @@ #include <stout/path.hpp> #include <stout/strings.hpp> -#include <csi/spec.hpp> - #include "resource_provider/storage/disk_profile_utils.hpp" namespace mesos { http://git-wip-us.apache.org/repos/asf/mesos/blob/eece6195/src/tests/mock_csi_plugin.hpp ---------------------------------------------------------------------- diff --git a/src/tests/mock_csi_plugin.hpp b/src/tests/mock_csi_plugin.hpp index d957042..bf74350 100644 --- a/src/tests/mock_csi_plugin.hpp +++ b/src/tests/mock_csi_plugin.hpp @@ -20,6 +20,8 @@ #include <memory> #include <string> +#include <csi/spec.hpp> + #include <gmock/gmock.h> #include <grpcpp/grpcpp.h> @@ -27,8 +29,6 @@ #include <stout/nothing.hpp> #include <stout/try.hpp> -#include <csi/spec.hpp> - namespace mesos { namespace internal { namespace tests {
