projects
/
folly.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add MSVC support to futures/Deprecated.h
[folly.git]
/
folly
/
futures
/
Future.h
diff --git
a/folly/futures/Future.h
b/folly/futures/Future.h
index 44983e718ba8a7dfcebbd46d642681d86b4c5ee1..0235c77a91e45399dfb43baf94afba541aeef82e 100644
(file)
--- a/
folly/futures/Future.h
+++ b/
folly/futures/Future.h
@@
-24,8
+24,8
@@
#include <vector>
#include <folly/Optional.h>
#include <vector>
#include <folly/Optional.h>
+#include <folly/Portability.h>
#include <folly/MoveWrapper.h>
#include <folly/MoveWrapper.h>
-#include <folly/futures/Deprecated.h>
#include <folly/futures/DrivableExecutor.h>
#include <folly/futures/Promise.h>
#include <folly/futures/Try.h>
#include <folly/futures/DrivableExecutor.h>
#include <folly/futures/Promise.h>
#include <folly/futures/Try.h>
@@
-287,19
+287,19
@@
class Future {
/// by then), and it is active (active by default).
///
/// Inactive Futures will activate upon destruction.
/// by then), and it is active (active by default).
///
/// Inactive Futures will activate upon destruction.
-
DEPRECATED
Future<T>& activate() & {
+
FOLLY_DEPRECATED("do not use")
Future<T>& activate() & {
core_->activate();
return *this;
}
core_->activate();
return *this;
}
-
DEPRECATED
Future<T>& deactivate() & {
+
FOLLY_DEPRECATED("do not use")
Future<T>& deactivate() & {
core_->deactivate();
return *this;
}
core_->deactivate();
return *this;
}
-
DEPRECATED
Future<T> activate() && {
+
FOLLY_DEPRECATED("do not use")
Future<T> activate() && {
core_->activate();
return std::move(*this);
}
core_->activate();
return std::move(*this);
}
-
DEPRECATED
Future<T> deactivate() && {
+
FOLLY_DEPRECATED("do not use")
Future<T> deactivate() && {
core_->deactivate();
return std::move(*this);
}
core_->deactivate();
return std::move(*this);
}