From 8c7e738263783a14dc9dc9c120e27613bcd7b87d Mon Sep 17 00:00:00 2001 From: fritzprix Date: Thu, 17 Jul 2014 23:38:34 +0900 Subject: [PATCH] - fix some type mismatch which causes error in build time --- libraries/mbed/common/InterruptManager.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libraries/mbed/common/InterruptManager.cpp b/libraries/mbed/common/InterruptManager.cpp index 6fe31f6531..59ce56b94d 100644 --- a/libraries/mbed/common/InterruptManager.cpp +++ b/libraries/mbed/common/InterruptManager.cpp @@ -7,7 +7,7 @@ namespace mbed { typedef void (*pvoidf)(void); -InterruptManager* InterruptManager::_instance = NULL; +InterruptManager* InterruptManager::_instance = (InterruptManager*)NULL; InterruptManager* InterruptManager::get() { if (NULL == _instance) @@ -25,7 +25,7 @@ void InterruptManager::destroy() { // is very likely to occur if (NULL != _instance) { delete _instance; - _instance = NULL; + _instance = (InterruptManager*)NULL; } } @@ -68,7 +68,7 @@ bool InterruptManager::remove_handler(pFunctionPointer_t handler, IRQn_Type irq) 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; }