From: Ron F. <ro...@us...> - 2006-04-17 13:50:55
|
Update of /cvsroot/nsclspectcl/SpecTcl/Display In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28068a/Display Modified Files: Tag: SpecTcl-3-0_developmentreally dispgrob.cc panemgr.cc refreshctl.cc trackcursor.cc Log Message: Fix 64bit unclealiness in Xamine Index: panemgr.cc =================================================================== RCS file: /cvsroot/nsclspectcl/SpecTcl/Display/panemgr.cc,v retrieving revision 5.1.2.2 retrieving revision 5.1.2.3 diff -C2 -d -r5.1.2.2 -r5.1.2.3 *** panemgr.cc 2 May 2005 15:51:21 -0000 5.1.2.2 --- panemgr.cc 17 Apr 2006 13:50:50 -0000 5.1.2.3 *************** *** 298,301 **** --- 298,304 ---- Change Log: $Log$ + Revision 5.1.2.3 2006/04/17 13:50:50 ron-fox + Fix 64bit unclealiness in Xamine + Revision 5.1.2.2 2005/05/02 15:51:21 ron-fox First passes at getting compilations on Intel C++: then *************** *** 863,867 **** /* call it and return. */ ! int row, col, index; XmProcessTraversal(pane->getid(), XmTRAVERSE_CURRENT); --- 866,870 ---- /* call it and return. */ ! long row, col, index; XmProcessTraversal(pane->getid(), XmTRAVERSE_CURRENT); Index: trackcursor.cc =================================================================== RCS file: /cvsroot/nsclspectcl/SpecTcl/Display/trackcursor.cc,v retrieving revision 5.1.2.1 retrieving revision 5.1.2.2 diff -C2 -d -r5.1.2.1 -r5.1.2.2 *** trackcursor.cc 21 Dec 2004 17:51:15 -0000 5.1.2.1 --- trackcursor.cc 17 Apr 2006 13:50:50 -0000 5.1.2.2 *************** *** 380,384 **** struct spec_location locdata; ! int index; int row, col; pane_db *pdb; --- 380,384 ---- struct spec_location locdata; ! long index; int row, col; pane_db *pdb; Index: dispgrob.cc =================================================================== RCS file: /cvsroot/nsclspectcl/SpecTcl/Display/dispgrob.cc,v retrieving revision 5.1.2.1 retrieving revision 5.1.2.2 diff -C2 -d -r5.1.2.1 -r5.1.2.2 *** dispgrob.cc 21 Dec 2004 17:51:13 -0000 5.1.2.1 --- dispgrob.cc 17 Apr 2006 13:50:50 -0000 5.1.2.2 *************** *** 652,656 **** ** the pane has encoded in it the widget index: */ ! int index, row, col; pane->GetAttribute(XmNuserData, &index); col = index % WINDOW_MAXAXIS; --- 652,656 ---- ** the pane has encoded in it the widget index: */ ! long index, row, col; pane->GetAttribute(XmNuserData, &index); col = index % WINDOW_MAXAXIS; *************** *** 724,728 **** ** the pane has encoded in it the widget index: */ ! int index, row, col; pane->GetAttribute(XmNuserData, &index); col = index % WINDOW_MAXAXIS; --- 724,728 ---- ** the pane has encoded in it the widget index: */ ! long index, row, col; pane->GetAttribute(XmNuserData, &index); col = index % WINDOW_MAXAXIS; *************** *** 796,800 **** ** the pane has encoded in it the widget index: */ ! int index, row, col; pane->GetAttribute(XmNuserData, &index); col = index % WINDOW_MAXAXIS; --- 796,800 ---- ** the pane has encoded in it the widget index: */ ! long index, row, col; pane->GetAttribute(XmNuserData, &index); col = index % WINDOW_MAXAXIS; *************** *** 870,874 **** ** the pane has encoded in it the widget index: */ ! int index, row, col; pane->GetAttribute(XmNuserData, &index); col = index % WINDOW_MAXAXIS; --- 870,874 ---- ** the pane has encoded in it the widget index: */ ! long index, row, col; pane->GetAttribute(XmNuserData, &index); col = index % WINDOW_MAXAXIS; *************** *** 949,953 **** ** the pane has encoded in it the widget index: */ ! int index, row, col; pane->GetAttribute(XmNuserData, &index); col = index % WINDOW_MAXAXIS; --- 949,953 ---- ** the pane has encoded in it the widget index: */ ! long index, row, col; pane->GetAttribute(XmNuserData, &index); col = index % WINDOW_MAXAXIS; *************** *** 1025,1029 **** ** the pane has encoded in it the widget index: */ ! int index, row, col; pane->GetAttribute(XmNuserData, &index); col = index % WINDOW_MAXAXIS; --- 1025,1029 ---- ** the pane has encoded in it the widget index: */ ! long index, row, col; pane->GetAttribute(XmNuserData, &index); col = index % WINDOW_MAXAXIS; *************** *** 1104,1108 **** ** the pane has encoded in it the widget index: */ ! int index, row, col; pane->GetAttribute(XmNuserData, &index); col = index % WINDOW_MAXAXIS; --- 1104,1108 ---- ** the pane has encoded in it the widget index: */ ! long index, row, col; pane->GetAttribute(XmNuserData, &index); col = index % WINDOW_MAXAXIS; *************** *** 1266,1270 **** ** partial point set will be visible. */ ! int index, row, col; p->GetAttribute(XmNuserData, &index); // This is the pane number. row = index % WINDOW_MAXAXIS; --- 1266,1270 ---- ** partial point set will be visible. */ ! long index, row, col; p->GetAttribute(XmNuserData, &index); // This is the pane number. row = index % WINDOW_MAXAXIS; *************** *** 1400,1404 **** ** partial point set will be visible. */ ! int index, row, col; p->GetAttribute(XmNuserData, &index); // This is the pane number. row = index % WINDOW_MAXAXIS; --- 1400,1404 ---- ** partial point set will be visible. */ ! long index, row, col; p->GetAttribute(XmNuserData, &index); // This is the pane number. row = index % WINDOW_MAXAXIS; *************** *** 1504,1508 **** // user data field: ! int index, row, col; pWindow->GetAttribute(XmNuserData, &index); col = index % WINDOW_MAXAXIS; --- 1504,1508 ---- // user data field: ! long index, row, col; pWindow->GetAttribute(XmNuserData, &index); col = index % WINDOW_MAXAXIS; Index: refreshctl.cc =================================================================== RCS file: /cvsroot/nsclspectcl/SpecTcl/Display/refreshctl.cc,v retrieving revision 5.1.2.3 retrieving revision 5.1.2.4 diff -C2 -d -r5.1.2.3 -r5.1.2.4 *** refreshctl.cc 7 Jul 2005 13:26:19 -0000 5.1.2.3 --- refreshctl.cc 17 Apr 2006 13:50:50 -0000 5.1.2.4 *************** *** 702,706 **** void Xamine_PaneRedrawCallback(XMWidget *w, XtPointer userd, XtPointer calld) { ! int index; int column, row; int ncol; --- 702,706 ---- void Xamine_PaneRedrawCallback(XMWidget *w, XtPointer userd, XtPointer calld) { ! long index; int column, row; int ncol; *************** *** 877,881 **** XMWidget *pane = (XMWidget *)wid; int ncol; ! int index; int col, row; pane_db *pdb; --- 877,881 ---- XMWidget *pane = (XMWidget *)wid; int ncol; ! long index; int col, row; pane_db *pdb; |