diff options
| author | NatsuDrag9 | 2018-06-20 10:22:31 +0530 |
|---|---|---|
| committer | NatsuDrag9 | 2018-06-20 10:22:31 +0530 |
| commit | c411d23bc89a22a3a18f69b339262e65ae91b8e2 (patch) | |
| tree | 53e2dc05dbb3e4197065e1cc6eba739958339e8f /ldmicro/miscutil.cpp | |
| parent | 90b89c63e58d36a6a693466a44877e6eeb3018c9 (diff) | |
| parent | 9860c3efa13a305be9fefde4e914dfc7ff6ae834 (diff) | |
| download | LDMicroGtk-c411d23bc89a22a3a18f69b339262e65ae91b8e2.tar.gz LDMicroGtk-c411d23bc89a22a3a18f69b339262e65ae91b8e2.tar.bz2 LDMicroGtk-c411d23bc89a22a3a18f69b339262e65ae91b8e2.zip | |
Resolved merging conflicts.
Diffstat (limited to 'ldmicro/miscutil.cpp')
| -rw-r--r-- | ldmicro/miscutil.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ldmicro/miscutil.cpp b/ldmicro/miscutil.cpp index 092f606..8f63398 100644 --- a/ldmicro/miscutil.cpp +++ b/ldmicro/miscutil.cpp @@ -23,9 +23,11 @@ #include "linuxUI.h" #include <stdio.h> #include <stdlib.h> - +#include <iostream> #include "ldmicro.h" +using namespace std; + // We should display messages to the user differently if we are running // interactively vs. in batch (command-line) mode. BOOL RunningInBatchMode = FALSE; @@ -158,8 +160,10 @@ void CheckHeap(char *file, int line) //----------------------------------------------------------------------------- void *CheckMalloc(size_t n) { + cout << "Inside CheckMalloc" << "\n"; ok(); void *p = HeapAlloc(MainHeap, HEAP_ZERO_MEMORY, n); + cout << "Exiting CheckMalloc" << "\n"; return p; } void CheckFree(void *p) |