diff options
| -rw-r--r-- | ldmicro/circuit.cpp | 6 | ||||
| -rw-r--r-- | ldmicro/confdialog.cpp | 1 | ||||
| -rw-r--r-- | ldmicro/ldmicro.cpp | 7 | ||||
| -rw-r--r-- | ldmicro/miscutil.cpp | 2 |
4 files changed, 0 insertions, 16 deletions
diff --git a/ldmicro/circuit.cpp b/ldmicro/circuit.cpp index 8b1a8e9..5f4bad9 100644 --- a/ldmicro/circuit.cpp +++ b/ldmicro/circuit.cpp @@ -37,12 +37,10 @@ static ElemSubcktSeries *LoadSeriesFromFile(FILE *f); //----------------------------------------------------------------------------- ElemLeaf *AllocLeaf(void) { - cout << "Inside AlocLeaf" << "\n"; return (ElemLeaf *)CheckMalloc(sizeof(ElemLeaf)); } ElemSubcktSeries *AllocSubcktSeries(void) { - cout << "Inside AllocSub" << "\n"; return (ElemSubcktSeries *)CheckMalloc(sizeof(ElemSubcktSeries)); } ElemSubcktParallel *AllocSubcktParallel(void) @@ -746,15 +744,11 @@ void DeleteSelectedRung(void) //----------------------------------------------------------------------------- static ElemSubcktSeries *AllocEmptyRung(void) { - cout << "Inside AllocEmpty" << "\n"; ElemSubcktSeries *s = AllocSubcktSeries(); - cout << "Checking series count" << "\n"; s->count = 1; - cout << "Series count done" << "\n"; s->contents[0].which = ELEM_PLACEHOLDER; ElemLeaf *l = AllocLeaf(); s->contents[0].d.leaf = l; - cout << "Exiting AllocEmpty" << "\n"; return s; } diff --git a/ldmicro/confdialog.cpp b/ldmicro/confdialog.cpp index f650f38..cb61ce7 100644 --- a/ldmicro/confdialog.cpp +++ b/ldmicro/confdialog.cpp @@ -162,7 +162,6 @@ void GetData (GtkWidget* widget, gpointer data){ char* buf; buf = const_cast <char*> (gtk_entry_get_text (GTK_ENTRY (CycleTextbox))); - // cout << sizeof (buf)/sizeof (*buf) << "\n"; Prog.cycleTime = (int)(1000*atof(buf) + 0.5); if(Prog.cycleTime == 0) { Error(_("Zero cycle time not valid; resetting to 10 ms.")); diff --git a/ldmicro/ldmicro.cpp b/ldmicro/ldmicro.cpp index c2e2e25..b961953 100644 --- a/ldmicro/ldmicro.cpp +++ b/ldmicro/ldmicro.cpp @@ -1041,12 +1041,9 @@ gboolean LD_WM_MouseMove_call(GtkWidget *widget, GdkEvent *event, gpointer user_ * WM_MOUSEMOVE */ -<<<<<<< HEAD -======= // g_print("x = %f\n", event->button.x_root); // g_print("y = %f\n", event->button.y_root); ->>>>>>> akshay-c-GUI_port // int x = LOWORD(lParam); // int y = HIWORD(lParam); @@ -1282,11 +1279,7 @@ int main(int argc, char** argv) /// Keyboard and mouse hooks equivalent to MainWndProc - end NewProgram(); -<<<<<<< HEAD - // strcpy(CurrentSaveFile, ""); -======= strcpy(CurrentSaveFile, ""); ->>>>>>> akshay-c-GUI_port // We are running interactively, or we would already have exited. We // can therefore show the window now, and otherwise set up the GUI. diff --git a/ldmicro/miscutil.cpp b/ldmicro/miscutil.cpp index 8f63398..777b721 100644 --- a/ldmicro/miscutil.cpp +++ b/ldmicro/miscutil.cpp @@ -160,10 +160,8 @@ 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) |