mesos-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ji...@apache.org
Subject [01/16] mesos git commit: Combined an 'undef' workaround for Windows.
Date Wed, 31 May 2017 21:51:15 GMT
Repository: mesos
Updated Branches:
  refs/heads/master d5c5561c0 -> 3e4a12cca


Combined an 'undef' workaround for Windows.

Review: https://reviews.apache.org/r/59673


Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/3e4a12cc
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/3e4a12cc
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/3e4a12cc

Branch: refs/heads/master
Commit: 3e4a12ccab9efff8a7ba7e95c35429fa5ff86402
Parents: b415c8c
Author: Jie Yu <yujie.jay@gmail.com>
Authored: Tue May 30 16:49:12 2017 -0700
Committer: Jie Yu <yujie.jay@gmail.com>
Committed: Wed May 31 14:51:10 2017 -0700

----------------------------------------------------------------------
 src/slave/slave.hpp | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/mesos/blob/3e4a12cc/src/slave/slave.hpp
----------------------------------------------------------------------
diff --git a/src/slave/slave.hpp b/src/slave/slave.hpp
index 77aff1d..7ffaed1 100644
--- a/src/slave/slave.hpp
+++ b/src/slave/slave.hpp
@@ -88,6 +88,7 @@
 // constant in the Windows SDK.
 #ifdef __WINDOWS__
 #undef REGISTERING
+#undef REGISTERED
 #endif // __WINDOWS__
 
 namespace mesos {
@@ -742,16 +743,6 @@ public:
   // Returns the task group associated with the task.
   Option<TaskGroupInfo> getQueuedTaskGroup(const TaskID& taskId);
 
-// Undefine NetBios preprocessor macros used by the `State` enum.
-#ifdef REGISTERING
-#undef REGISTERING
-#endif // REGISTERING
-
-#ifdef REGISTERED
-#undef REGISTERED
-#endif // REGISTERED
-
-
   enum State
   {
     REGISTERING,  // Executor is launched but not (re-)registered yet.


Mime
View raw message