From 4b29cfa5e61cb721aac779ffbb167bed16b01c51 Mon Sep 17 00:00:00 2001 From: keeramis Date: Fri, 9 Oct 2020 13:54:52 -0500 Subject: [PATCH] Remove deprecation warnings around particle subscribe --- wiring/inc/spark_wiring_cloud.h | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/wiring/inc/spark_wiring_cloud.h b/wiring/inc/spark_wiring_cloud.h index c31fea74be..cf23c2b8b6 100644 --- a/wiring/inc/spark_wiring_cloud.h +++ b/wiring/inc/spark_wiring_cloud.h @@ -41,9 +41,6 @@ #include #include -#define PARTICLE_DEPRECATED_API_DEFAULT_SUBSCRIBE_SCOPE \ - PARTICLE_DEPRECATED_API("Beginning with 0.8.0 release, Particle.subscribe() will require event scope to be specified explicitly."); - typedef std::function user_std_function_int_str_t; typedef std::function wiring_event_handler_t; @@ -319,11 +316,10 @@ class CloudClass { return subscribe(eventName, std::bind(handler, instance, _1, _2), deviceID); } - // Deprecated methods - bool subscribe(const char* name, EventHandler handler) PARTICLE_DEPRECATED_API_DEFAULT_SUBSCRIBE_SCOPE; - bool subscribe(const char* name, wiring_event_handler_t handler) PARTICLE_DEPRECATED_API_DEFAULT_SUBSCRIBE_SCOPE; + bool subscribe(const char* name, EventHandler handler); + bool subscribe(const char* name, wiring_event_handler_t handler); template - bool subscribe(const char* name, void (T::*handler)(const char*, const char*), T* instance) PARTICLE_DEPRECATED_API_DEFAULT_SUBSCRIBE_SCOPE; + bool subscribe(const char* name, void (T::*handler)(const char*, const char*), T* instance); void unsubscribe() { @@ -558,7 +554,6 @@ inline bool CloudDisconnectOptions::isTimeoutSet() const { return (flags_ & OptionFlag::TIMEOUT); } -// Deprecated methods inline particle::Future CloudClass::publish(const char* name) { return publish(name, PUBLIC); }