projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Try to find the type of the parameter automatically if it isn't defined manually
[bertos.git]
/
bertos
/
emul
/
emul.cpp
diff --git
a/bertos/emul/emul.cpp
b/bertos/emul/emul.cpp
index 9b06fb90269236d1a34a07164ce9b9af2b47291a..3d0eb0a49c5b81ae7ac364816fe294a8919af8a4 100644
(file)
--- a/
bertos/emul/emul.cpp
+++ b/
bertos/emul/emul.cpp
@@
-91,6
+91,10
@@
extern "C" void emul_cleanup()
{
MOD_CLEANUP(emul);
{
MOD_CLEANUP(emul);
+ // Timer must be made inactive before we destroy the emulator
+ extern bool timer_initialized;
+ ASSERT(!timer_initialized);
+
delete emul;
emul = NULL;
}
delete emul;
emul = NULL;
}