You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by dm...@apache.org on 2015/02/23 18:55:09 UTC
[3/3] mesos git commit: libprocess: Moved MAC and IP classes to
stout/mac.hpp and stout/ip.hpp
libprocess: Moved MAC and IP classes to stout/mac.hpp and stout/ip.hpp
Review: https://reviews.apache.org/r/31001
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/135bc70e
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/135bc70e
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/135bc70e
Branch: refs/heads/master
Commit: 135bc70e8aa83d074c1610ce3058d5e56ef5f388
Parents: 628786b
Author: Evelina Dumitrescu <ev...@gmail.com>
Authored: Mon Feb 23 09:21:17 2015 -0800
Committer: Dominic Hamon <dm...@twitter.com>
Committed: Mon Feb 23 09:22:18 2015 -0800
----------------------------------------------------------------------
3rdparty/libprocess/3rdparty/Makefile.am | 3 ++-
3rdparty/libprocess/include/process/http.hpp | 2 +-
3rdparty/libprocess/include/process/socket.hpp | 1 -
3rdparty/libprocess/src/http.cpp | 2 ++
4 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/135bc70e/3rdparty/libprocess/3rdparty/Makefile.am
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/3rdparty/Makefile.am b/3rdparty/libprocess/3rdparty/Makefile.am
index 85170a1..e55147a 100644
--- a/3rdparty/libprocess/3rdparty/Makefile.am
+++ b/3rdparty/libprocess/3rdparty/Makefile.am
@@ -155,11 +155,12 @@ stout_tests_SOURCES = \
$(STOUT)/tests/hashmap_tests.cpp \
$(STOUT)/tests/hashset_tests.cpp \
$(STOUT)/tests/interval_tests.cpp \
+ $(STOUT)/tests/ip_tests.cpp \
$(STOUT)/tests/json_tests.cpp \
$(STOUT)/tests/linkedhashmap_tests.cpp \
+ $(STOUT)/tests/mac_tests.cpp \
$(STOUT)/tests/main.cpp \
$(STOUT)/tests/multimap_tests.cpp \
- $(STOUT)/tests/net_tests.cpp \
$(STOUT)/tests/none_tests.cpp \
$(STOUT)/tests/option_tests.cpp \
$(STOUT)/tests/os_tests.cpp \
http://git-wip-us.apache.org/repos/asf/mesos/blob/135bc70e/3rdparty/libprocess/include/process/http.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/http.hpp b/3rdparty/libprocess/include/process/http.hpp
index 523ef7e..10143fd 100644
--- a/3rdparty/libprocess/include/process/http.hpp
+++ b/3rdparty/libprocess/include/process/http.hpp
@@ -17,8 +17,8 @@
#include <stout/error.hpp>
#include <stout/foreach.hpp>
#include <stout/hashmap.hpp>
+#include <stout/ip.hpp>
#include <stout/json.hpp>
-#include <stout/net.hpp>
#include <stout/none.hpp>
#include <stout/numify.hpp>
#include <stout/option.hpp>
http://git-wip-us.apache.org/repos/asf/mesos/blob/135bc70e/3rdparty/libprocess/include/process/socket.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/socket.hpp b/3rdparty/libprocess/include/process/socket.hpp
index 426b3fa..2c42587 100644
--- a/3rdparty/libprocess/include/process/socket.hpp
+++ b/3rdparty/libprocess/include/process/socket.hpp
@@ -8,7 +8,6 @@
#include <stout/abort.hpp>
#include <stout/nothing.hpp>
-#include <stout/net.hpp>
#include <stout/os.hpp>
#include <stout/try.hpp>
http://git-wip-us.apache.org/repos/asf/mesos/blob/135bc70e/3rdparty/libprocess/src/http.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/http.cpp b/3rdparty/libprocess/src/http.cpp
index 7503313..f9d9daf 100644
--- a/3rdparty/libprocess/src/http.cpp
+++ b/3rdparty/libprocess/src/http.cpp
@@ -13,7 +13,9 @@
#include <process/owned.hpp>
#include <process/socket.hpp>
+#include <stout/ip.hpp>
#include <stout/lambda.hpp>
+#include <stout/net.hpp>
#include <stout/nothing.hpp>
#include <stout/option.hpp>
#include <stout/try.hpp>