Diff: internal/types/ScanResult.cpp

Revision:

6:8a87a59d0d21

Parent:

1:6ec9998427ad

Child:

16:7f1d6d359787

--- a/internal/types/ScanResult.cpp	Mon Aug 11 04:00:39 2014 -0700
+++ b/internal/types/ScanResult.cpp	Mon Aug 11 13:55:07 2014 -0700
@@ -8,8 +8,6 @@
  * written permission of ACKme Networks.
  */
 
-#include <assert.h>
-
 #include "Wiconnect.h"
 #include "types/ScanResult.h"
 #include "NetworkInterface.h"
@@ -70,14 +68,16 @@
 /*************************************************************************************************/
 void* ScanResult::operator new(size_t size)
 {
-    assert(Wiconnect::getInstance()->_malloc != NULL);
+    Wiconnect *wiconnect = Wiconnect::getInstance();
+    wiconnect_assert(wiconnect, "ScanResult:new, malloc not defined", wiconnect->_malloc != NULL);
     return Wiconnect::getInstance()->_malloc(size);
 }
 
 /*************************************************************************************************/
 void ScanResult::operator delete(void* ptr)
 {
-    assert(Wiconnect::getInstance()->_free != NULL);
+    Wiconnect *wiconnect = Wiconnect::getInstance();
+    wiconnect_assert(wiconnect, "ScanResult:delete, free not defined", wiconnect->_free != NULL);
     Wiconnect::getInstance()->_free(ptr);
 }