Remove deprecation warnings around particle subscribe

particle-iot · Oct 13, 2020 · 4b29cfa · 4b29cfa
1 parent 5ef3960
commit 4b29cfa
Showing 1 changed file with 3 additions and 8 deletions.
diff --git a/wiring/inc/spark_wiring_cloud.h b/wiring/inc/spark_wiring_cloud.h
@@ -41,9 +41,6 @@
 #include <functional>
 #include <type_traits>
 
-#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_function_int_str_t> user_std_function_int_str_t;
 typedef std::function<void (const char*, const char*)> 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<typename T>
-    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<bool> CloudClass::publish(const char* name) {
     return publish(name, PUBLIC);
 }