Просмотр исходного кода

v3.0.2: bug: default constructor is ambiguous when Status Request objects are enabled (github issue #65 & #68)

Anatoli Arkhipenko 7 лет назад
Родитель
Сommit
8a395afa63
2 измененных файлов с 12 добавлено и 5 удалено
  1. 6 2
      src/TaskScheduler.h
  2. 6 3
      src/TaskSchedulerDeclarations.h

+ 6 - 2
src/TaskScheduler.h

@@ -140,8 +140,11 @@
 // v3.0.0:
 //    2018-03-15 - Major Release: Support for dynamic callback methods binding via compilation parameter _TASK_OO_CALLBACKS
 //
-// v.3.0.1:
-//    2018-11-09 - bug: task deleted from the execution chain cannot be added back
+// v3.0.1:
+//    2018-11-09 - bug: task deleted from the execution chain cannot be added back (github issue #67)
+//
+// v3.0.2:
+//    2018-11-11 - bug: default constructor is ambiguous when Status Request objects are enabled (github issue #65 & #68)
 
 #include <Arduino.h>
 #include "TaskSchedulerDeclarations.h"
@@ -257,6 +260,7 @@ Task::~Task() {
  *  StatusRequest only triggering (always immediate and only 1 iteration)
  */
 
+
 #ifdef _TASK_OO_CALLBACKS
 Task::Task( Scheduler* aScheduler ) {
     reset();

+ 6 - 3
src/TaskSchedulerDeclarations.h

@@ -133,11 +133,14 @@ class Task {
     INLINE Task(unsigned long aInterval=0, long aIterations=0, TaskCallback aCallback=NULL, Scheduler* aScheduler=NULL, bool aEnable=false, TaskOnEnable aOnEnable=NULL, TaskOnDisable aOnDisable=NULL);
 #endif // _TASK_OO_CALLBACKS
 
+
 #ifdef _TASK_STATUS_REQUEST
 #ifdef _TASK_OO_CALLBACKS
-    INLINE Task(Scheduler* aScheduler=NULL);
+//    INLINE Task(Scheduler* aScheduler=NULL);
+    INLINE Task(Scheduler* aScheduler);
 #else
-    INLINE Task(TaskCallback aCallback=NULL, Scheduler* aScheduler=NULL, TaskOnEnable aOnEnable=NULL, TaskOnDisable aOnDisable=NULL);
+//    INLINE Task(TaskCallback aCallback=NULL, Scheduler* aScheduler=NULL, TaskOnEnable aOnEnable=NULL, TaskOnDisable aOnDisable=NULL);
+    INLINE Task(TaskCallback aCallback, Scheduler* aScheduler, TaskOnEnable aOnEnable=NULL, TaskOnDisable aOnDisable=NULL);
 #endif // _TASK_OO_CALLBACKS
 #endif  // _TASK_STATUS_REQUEST
 
@@ -231,7 +234,7 @@ class Task {
 
 #ifndef _TASK_OO_CALLBACKS
     TaskCallback              iCallback;             // pointer to the void callback method
-    TaskOnEnable              iOnEnable;             // pointer to the bolol OnEnable callback method
+    TaskOnEnable              iOnEnable;             // pointer to the bool OnEnable callback method
     TaskOnDisable             iOnDisable;            // pointer to the void OnDisable method
 #endif // _TASK_OO_CALLBACKS