Add MSVC support to futures/Deprecated.h

Summary: It was originally unconditionally useing `__attribute__` syntax, so this makes it conditionally use the `__declspec` syntax.
Closes #268

Reviewed By: @yfeldblum

Differential Revision: D2283909

Pulled By: @sgolemon

diff --git a/folly/Makefile.am b/folly/Makefile.am
index bf79eee509c836ab6d1a159c42ed6c938b227f8b..ce4319adf2cd41d292a971d717646c2353425af6 100644 (file)
--- a/folly/Makefile.am
+++ b/folly/Makefile.am
@@ -131,7 +131,6 @@ nobase_follyinclude_HEADERS = \
        Format.h \
        Format-inl.h \
        futures/Barrier.h \
-       futures/Deprecated.h \
        futures/ThreadedExecutor.h \
        futures/DrivableExecutor.h \
        futures/Future-pre.h \

diff --git a/folly/Portability.h b/folly/Portability.h
index 252362a5006fcca7a87b4d2e5e622e0854b78856..fad35b1dff410fcec22e6fb036f2c6d1340a5728 100644 (file)
--- a/folly/Portability.h
+++ b/folly/Portability.h
@@ -94,7 +94,7 @@ struct MaxAlign { char c; } __attribute__((__aligned__));
 #elif defined(_MSC_VER)
 # define FOLLY_DEPRECATED(msg) __declspec(deprecated(msg))
 #else
-# define FOLLY_DEPRECATED
+# define FOLLY_DEPRECATED(msg)
 #endif
 
 // noreturn

diff --git a/folly/futures/Deprecated.h b/folly/futures/Deprecated.h
deleted file mode 100644 (file)
index 1e02f8c..0000000
--- a/folly/futures/Deprecated.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright 2015 Facebook, Inc.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-#pragma once
-#define DEPRECATED __attribute__((__deprecated__))

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 <folly/Portability.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>
@@ -287,19 +287,19 @@ class Future {
   /// 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;
   }
-  DEPRECATED Future<T>& deactivate() & {
+  FOLLY_DEPRECATED("do not use") Future<T>& deactivate() & {
     core_->deactivate();
     return *this;
   }
-  DEPRECATED Future<T> activate() && {
+  FOLLY_DEPRECATED("do not use") Future<T> activate() && {
     core_->activate();
     return std::move(*this);
   }
-  DEPRECATED Future<T> deactivate() && {
+  FOLLY_DEPRECATED("do not use") Future<T> deactivate() && {
     core_->deactivate();
     return std::move(*this);
   }

diff --git a/folly/futures/Promise.h b/folly/futures/Promise.h
index 9d6be3c34eb54293d9e9f6b4443e9ddeec1065ed..eb673754a593b0af8d8908f37f4f979b372e72bd 100644 (file)
--- a/folly/futures/Promise.h
+++ b/folly/futures/Promise.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <folly/futures/Deprecated.h>
+#include <folly/Portability.h>
 #include <folly/futures/Try.h>
 #include <functional>
 
@@ -53,7 +53,8 @@ public:
       p.setException(std::current_exception());
     }
     */
-  DEPRECATED void setException(std::exception_ptr const&);
+  FOLLY_DEPRECATED("use setException(exception_wrapper)")
+  void setException(std::exception_ptr const&);
 
   /** Fulfill the Promise with an exception type E, which can be passed to
     std::make_exception_ptr(). Useful for originating exceptions. If you

diff --git a/folly/futures/SharedPromise.h b/folly/futures/SharedPromise.h
index 5fecffca8af4f7fc34f27def8228eb0a670ca49d..dc37e004854110344bb7105c0ed18a88b2992b80 100644 (file)
--- a/folly/futures/SharedPromise.h
+++ b/folly/futures/SharedPromise.h
@@ -17,6 +17,7 @@
 #pragma once
 
 #include <folly/futures/Promise.h>
+#include <folly/Portability.h>
 
 namespace folly {
 
@@ -64,7 +65,8 @@ public:
       p.setException(std::current_exception());
     }
     */
-  DEPRECATED void setException(std::exception_ptr const&);
+  FOLLY_DEPRECATED("use setException(exception_wrapper)")
+  void setException(std::exception_ptr const&);
 
   /** Fulfill the SharedPromise with an exception type E, which can be passed to
     std::make_exception_ptr(). Useful for originating exceptions. If you

diff --git a/folly/futures/Try.h b/folly/futures/Try.h
index 79c221631897b0d5ec708986528fd437d662e45d..e5e38afbbf42275fe4397ac6c0c423eea480f8b3 100644 (file)
--- a/folly/futures/Try.h
+++ b/folly/futures/Try.h
@@ -22,7 +22,7 @@
 #include <folly/ExceptionWrapper.h>
 #include <folly/Likely.h>
 #include <folly/Memory.h>
-#include <folly/futures/Deprecated.h>
+#include <folly/Portability.h>
 #include <folly/futures/FutureException.h>
 #include <folly/futures/Unit.h>
 
@@ -94,7 +94,8 @@ class Try {
    *
    * @param ep The exception_pointer. Will be rethrown.
    */
-  DEPRECATED explicit Try(std::exception_ptr ep)
+  FOLLY_DEPRECATED("use Try(exception_wrapper)")
+  explicit Try(std::exception_ptr ep)
     : contains_(Contains::EXCEPTION) {
     try {
       std::rethrow_exception(ep);
@@ -254,7 +255,8 @@ class Try<void> {
    *
    * @param ep The exception_pointer. Will be rethrown.
    */
-  DEPRECATED explicit Try(std::exception_ptr ep) : hasValue_(false) {
+  FOLLY_DEPRECATED("use Try(exception_wrapper)")
+  explicit Try(std::exception_ptr ep) : hasValue_(false) {
     try {
       std::rethrow_exception(ep);
     } catch (const std::exception& e) {

diff --git a/folly/futures/helpers.h b/folly/futures/helpers.h
index ea1dc70d8aec4c4225335dcf538e503031c89cce..30e657c7a9cd675c0c461f15f82ec8c130a04bfb 100644 (file)
--- a/folly/futures/helpers.h
+++ b/folly/futures/helpers.h
@@ -16,6 +16,7 @@
 #pragma once
 
 #include <folly/futures/Future.h>
+#include <folly/Portability.h>
 
 namespace folly {
 
@@ -85,7 +86,8 @@ auto makeFutureWith(F&& func)
 ///
 ///   auto f = makeFuture<string>(std::current_exception());
 template <class T>
-DEPRECATED Future<T> makeFuture(std::exception_ptr const& e);
+FOLLY_DEPRECATED("use makeFuture(exception_wrapper)")
+Future<T> makeFuture(std::exception_ptr const& e);
 
 /// Make a failed Future from an exception_wrapper.
 template <class T>