Diff: common/InterruptManager.cpp

Revision:

262:85569914dbe0

Parent:

221:8276e3a4886f

--- a/common/InterruptManager.cpp	Mon Jul 21 07:45:07 2014 +0100
+++ b/common/InterruptManager.cpp	Mon Jul 21 08:45:07 2014 +0100
@@ -7,7 +7,7 @@
 
 typedef void (*pvoidf)(void);
 
-InterruptManager* InterruptManager::_instance = NULL;
+InterruptManager* InterruptManager::_instance = (InterruptManager*)NULL;
 
 InterruptManager* InterruptManager::get() {
     if (NULL == _instance)
@@ -25,7 +25,7 @@
     // is very likely to occur
     if (NULL != _instance) {
         delete _instance;
-        _instance = NULL;
+        _instance = (InterruptManager*)NULL;
     }
 }
 
@@ -68,7 +68,7 @@
     if (_chains[irq_pos]->size() == 1 && NULL != _chains[irq_pos]->get(0)->get_function()) {
         NVIC_SetVector(irq, (uint32_t)_chains[irq_pos]->get(0)->get_function());
         delete _chains[irq_pos];
-        _chains[irq_pos] = NULL;
+        _chains[irq_pos] = (CallChain*) NULL;
     }
     return true;
 }