From a53a740a2a1cb6cbfa58cc79caedd4e947ff1ca0 Mon Sep 17 00:00:00 2001 From: dos-reis Date: Sun, 28 Nov 2010 18:27:48 +0000 Subject: * clef/: Add using directive at toplevel. * etc/: Likewise. * graph/: Likewise. * hyper/: Likewise. * lib/: Likewise. * sman/: Likewise. * Makefile.am (OA_SMAN_TARGETS): New. (OA_GRAPHICS_TARGETS): Likewise. --- src/graph/Gdraws/Gfun.c | 2 ++ src/graph/include/sselect.H1 | 2 +- src/graph/view2D/main2d.c | 2 ++ src/graph/view2D/process2d.c | 4 +++- src/graph/view2D/viewport2D.c | 2 ++ src/graph/view3D/main3d.c | 2 ++ src/graph/view3D/process3d.c | 2 +- src/graph/viewAlone/spoon2D.c | 2 ++ src/graph/viewAlone/spoonComp.c | 2 ++ src/graph/viewman/fun2D.c | 2 ++ src/graph/viewman/fun3D.c | 2 ++ src/graph/viewman/globalsM.h | 2 +- src/graph/viewman/sselect.c | 6 +++--- src/graph/viewman/viewman.c | 6 ++++-- 14 files changed, 29 insertions(+), 9 deletions(-) (limited to 'src/graph') diff --git a/src/graph/Gdraws/Gfun.c b/src/graph/Gdraws/Gfun.c index 7052256b..07237838 100644 --- a/src/graph/Gdraws/Gfun.c +++ b/src/graph/Gdraws/Gfun.c @@ -48,6 +48,8 @@ #include "Gfun.H1" #include "cfuns.h" +using namespace OpenAxiom; + /* * Given 2 file pointers, this function copies file ifp to file ofp diff --git a/src/graph/include/sselect.H1 b/src/graph/include/sselect.H1 index 9dc75670..46645e0e 100644 --- a/src/graph/include/sselect.H1 +++ b/src/graph/include/sselect.H1 @@ -1,2 +1,2 @@ -extern int superSelect(int n , int * rd , int * wr , int * ex , char * timeout); +extern int superSelect(int n , fd_set * rd , fd_set * wr , fd_set * ex , timeval * timeout); diff --git a/src/graph/view2D/main2d.c b/src/graph/view2D/main2d.c index 5df59398..5642c7ae 100644 --- a/src/graph/view2D/main2d.c +++ b/src/graph/view2D/main2d.c @@ -51,6 +51,8 @@ #include "XSpadFill.h" #include "cfuns.h" +using namespace OpenAxiom; + /**********************/ /** global variables **/ diff --git a/src/graph/view2D/process2d.c b/src/graph/view2D/process2d.c index eb711bc9..803a2822 100644 --- a/src/graph/view2D/process2d.c +++ b/src/graph/view2D/process2d.c @@ -54,6 +54,8 @@ #include "XSpadFill.h" #include "cfuns.h" +using namespace OpenAxiom; + static int doit=0; /* globish variable for picking/dropping/clearing - all sorts of 2 button sequence events (command & graph #). */ @@ -533,7 +535,7 @@ processEvents(void) break; } if (!followMouse) - len=select(FD_SETSIZE,(void *) &rd,0,0,0); + len=select(FD_SETSIZE, &rd,0,0,0); else len=1; } diff --git a/src/graph/view2D/viewport2D.c b/src/graph/view2D/viewport2D.c index ec1f7083..0d5aaf30 100644 --- a/src/graph/view2D/viewport2D.c +++ b/src/graph/view2D/viewport2D.c @@ -60,6 +60,8 @@ #include "spadBitmap.bitmap" #include "spadMask.mask" +using namespace OpenAxiom; + #define rint(z) ((int)(z)) Atom wm_delete_window; diff --git a/src/graph/view3D/main3d.c b/src/graph/view3D/main3d.c index 60593094..b00d2b87 100644 --- a/src/graph/view3D/main3d.c +++ b/src/graph/view3D/main3d.c @@ -54,6 +54,8 @@ #include "all_3d.H1" #include "cfuns.h" +using namespace OpenAxiom; + /**********************/ /** global variables **/ /**********************/ diff --git a/src/graph/view3D/process3d.c b/src/graph/view3D/process3d.c index 5e56825d..dc8540b0 100644 --- a/src/graph/view3D/process3d.c +++ b/src/graph/view3D/process3d.c @@ -913,7 +913,7 @@ processEvents(void) break; } if (!followMouse) - len=select(FD_SETSIZE,(void *)&rd,0,0,0); + len=select(FD_SETSIZE, &rd,0,0,0); else len=1; } diff --git a/src/graph/viewAlone/spoon2D.c b/src/graph/viewAlone/spoon2D.c index d19b008f..2765ce56 100644 --- a/src/graph/viewAlone/spoon2D.c +++ b/src/graph/viewAlone/spoon2D.c @@ -47,6 +47,8 @@ #include "cfuns.h" #include "all_alone.H1" +using namespace OpenAxiom; + /* #define huhDEBUG */ /* #define spoonDEBUG */ diff --git a/src/graph/viewAlone/spoonComp.c b/src/graph/viewAlone/spoonComp.c index 8c8dcd0e..b708eed3 100644 --- a/src/graph/viewAlone/spoonComp.c +++ b/src/graph/viewAlone/spoonComp.c @@ -47,6 +47,8 @@ #include "cfuns.h" #include "all_alone.H1" +using namespace OpenAxiom; + /* This file forks a child process and exits the parent. It diff --git a/src/graph/viewman/fun2D.c b/src/graph/viewman/fun2D.c index 7027a40b..02810ffe 100644 --- a/src/graph/viewman/fun2D.c +++ b/src/graph/viewman/fun2D.c @@ -52,6 +52,8 @@ #include "make2D.H1" #include "cfuns.h" +using namespace OpenAxiom; + #define writeEach void diff --git a/src/graph/viewman/fun3D.c b/src/graph/viewman/fun3D.c index f277a442..a0ced1b6 100644 --- a/src/graph/viewman/fun3D.c +++ b/src/graph/viewman/fun3D.c @@ -52,6 +52,8 @@ #include "readView.H1" #include "cfuns.h" +using namespace OpenAxiom; + void funView3D(int viewCommand) { diff --git a/src/graph/viewman/globalsM.h b/src/graph/viewman/globalsM.h index cce83265..0dd1690b 100644 --- a/src/graph/viewman/globalsM.h +++ b/src/graph/viewman/globalsM.h @@ -34,7 +34,7 @@ */ extern viewManager *viewports,*slot,*stepSlot; -extern openaxiom_sio* spadSock; +extern OpenAxiom::openaxiom_sio* spadSock; extern int viewType, viewCommand; extern fd_set filedes; extern int acknow; diff --git a/src/graph/viewman/sselect.c b/src/graph/viewman/sselect.c index 0e56e9a7..68a3f869 100644 --- a/src/graph/viewman/sselect.c +++ b/src/graph/viewman/sselect.c @@ -60,14 +60,14 @@ *******************************************/ int -superSelect(int n, int *rd, int *wr, int *ex, char *timeout) +superSelect(int n, fd_set *rd, fd_set *wr, fd_set *ex, timeval *timeout) { int waiting; viewManager *viewport; int ret_val; - ret_val = select(n, (void *)rd, (void *)wr, (void *)ex, (void *)timeout); + ret_val = select(n, rd, wr, ex, timeout); while (ret_val == -1 && errno == EINTR) { /* checkClosedChild gets set by the SIGCHLD handler */ if (checkClosedChild) { @@ -84,7 +84,7 @@ superSelect(int n, int *rd, int *wr, int *ex, char *timeout) bsdSignal(OPENAXIOM_SIGCHLD,endChild,DontRestartSystemCalls); } } - ret_val = select(n, (void *)rd, (void *)wr, (void *)ex, (void *)timeout); + ret_val = select(n, rd, wr, ex, timeout); } return ret_val; } diff --git a/src/graph/viewman/viewman.c b/src/graph/viewman/viewman.c index a8dd4777..5085a3e9 100644 --- a/src/graph/viewman/viewman.c +++ b/src/graph/viewman/viewman.c @@ -57,6 +57,8 @@ #include "cleanup.H1" #include "sselect.H1" +using namespace OpenAxiom; + /************* global variables **************/ Display *dsply; @@ -125,9 +127,9 @@ main (void) #ifdef DEBUG fprintf(stderr,"Selection for filedes of %x \n",filedes); #endif - code = check(superSelect(FD_SETSIZE,(void *) &filedes,0,0,0)); + code = check(superSelect(FD_SETSIZE, &filedes,0,0,0)); for (;code<=0;) - code = check(superSelect(FD_SETSIZE,(void *)&filedes,0,0,0)); + code = check(superSelect(FD_SETSIZE, &filedes,0,0,0)); slot = viewports; keepLooking = 1; -- cgit v1.2.3