From 8afbe25d2216d8f56045859cec0ecf64b0f157d1 Mon Sep 17 00:00:00 2001 From: Bryan Kowal Date: Tue, 12 Nov 2013 19:57:25 -0600 Subject: [PATCH] Issue #2547 - fix RHEL6 nativeLib build in 14.1.1 Former-commit-id: e3639da7031a4b349f266f02c2daa6dee9da617a [formerly a51231058aaf114bf8964ca067186919a9856a9a [formerly 7af6c4794f9523e6f0d632b0a9f34e8f5cbcda3f]] Former-commit-id: a51231058aaf114bf8964ca067186919a9856a9a Former-commit-id: b2272ad695dae7cadc96fde55f7645585691c83a --- nativeLib/build.native/makefile.arch | 2 +- nativeLib/build.native/tools/compile.sh | 0 nativeLib/edex_com/.cproject | 8 +- nativeLib/edex_notify/.cproject | 8 +- nativeLib/ncep_grib2module/.cproject | 4 +- nativeLib/rary.cots.jepp/.cproject | 4 +- nativeLib/rary.empty.motif/.cproject | 837 +++++----- nativeLib/rary.empty.motif/src/X11.c | 4 - nativeLib/rary.meteorological/src/solax.f | 16 +- nativeLib/rary.ohd.pproc/.cproject | 714 ++++---- nativeLib/rary.wfoapi.getTestMode/.cproject | 1482 ++++++---------- .../rary.wfoapi.getTestMode/src/getTestMode.C | 3 +- .../rary.wfoapi.getTestMode/src/sockhelp.C | 10 +- .../rary.wfoapi.showBanner/src/showBanner.C | 1 - .../.cproject | 1484 ++++++---------- .../src/sockhelp.C | 10 +- nativeLib/rary.wfoapi.tmb/.cproject | 1485 ++++++----------- nativeLib/rary.wfoapi.tmb/src/sockhelp.C | 10 +- nativeLib/rary.wfoapi.tmb_exit/.cproject | 1482 ++++++---------- nativeLib/rary.wfoapi.tmb_exit/src/sockhelp.C | 10 +- nativeLib/rary.wfoapi.tmcp/src/tmcp.C | 2 +- 21 files changed, 2950 insertions(+), 4626 deletions(-) mode change 100644 => 100755 nativeLib/build.native/tools/compile.sh diff --git a/nativeLib/build.native/makefile.arch b/nativeLib/build.native/makefile.arch index c3fb33ce2c..da3d33d748 100644 --- a/nativeLib/build.native/makefile.arch +++ b/nativeLib/build.native/makefile.arch @@ -6,7 +6,7 @@ # set to one of: {-m32, -m64} to specify the architecture. # setting the flag to anything other than -m32 or -m64 will # cause unknown, potentially chaotic, build results. -ARCHFLAGS = -m64 +ARCHFLAGS = -m32 # ARCHFLAGS is set into the build environment so that scripts # that utilize this script can execute their own architecture diff --git a/nativeLib/build.native/tools/compile.sh b/nativeLib/build.native/tools/compile.sh old mode 100644 new mode 100755 diff --git a/nativeLib/edex_com/.cproject b/nativeLib/edex_com/.cproject index c5cebfd85f..399a52d2b9 100644 --- a/nativeLib/edex_com/.cproject +++ b/nativeLib/edex_com/.cproject @@ -1,7 +1,5 @@ - - - + @@ -20,12 +18,12 @@ - + @@ -117,12 +115,12 @@ - + diff --git a/nativeLib/edex_notify/.cproject b/nativeLib/edex_notify/.cproject index a0a2fc7b03..b62dd8dd2b 100644 --- a/nativeLib/edex_notify/.cproject +++ b/nativeLib/edex_notify/.cproject @@ -1,7 +1,5 @@ - - - + @@ -21,12 +19,12 @@ - + @@ -105,12 +103,12 @@ - + diff --git a/nativeLib/ncep_grib2module/.cproject b/nativeLib/ncep_grib2module/.cproject index be76fd5e52..65a0942f1e 100644 --- a/nativeLib/ncep_grib2module/.cproject +++ b/nativeLib/ncep_grib2module/.cproject @@ -14,12 +14,12 @@ - + @@ -122,12 +122,12 @@ - + diff --git a/nativeLib/rary.cots.jepp/.cproject b/nativeLib/rary.cots.jepp/.cproject index 3b99ad9f87..a95b772a52 100644 --- a/nativeLib/rary.cots.jepp/.cproject +++ b/nativeLib/rary.cots.jepp/.cproject @@ -1,7 +1,5 @@ - - - + diff --git a/nativeLib/rary.empty.motif/.cproject b/nativeLib/rary.empty.motif/.cproject index 0bdcb332a1..c7a3e7707e 100644 --- a/nativeLib/rary.empty.motif/.cproject +++ b/nativeLib/rary.empty.motif/.cproject @@ -1,420 +1,421 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/nativeLib/rary.empty.motif/src/X11.c b/nativeLib/rary.empty.motif/src/X11.c index 66e52cb8eb..478e0839ad 100644 --- a/nativeLib/rary.empty.motif/src/X11.c +++ b/nativeLib/rary.empty.motif/src/X11.c @@ -7,8 +7,6 @@ #include "error.h" -void XDestroyRegion () {nolibError("Motif");} - void XFreeFont () {nolibError("Motif");} void XGetWindowAttributes () {nolibError("Motif");} @@ -17,8 +15,6 @@ void XGrabButton () {nolibError("Motif");} void XLoadFont () {nolibError("Motif");} void XMapWindow () {nolibError("Motif");} -void XPointInRegion () {nolibError("Motif");} -void XPolygonRegion () {nolibError("Motif");} void XQueryColor () {nolibError("Motif");} void XQueryFont () {nolibError("Motif");} void XReadBitmapFile () {nolibError("Motif");} diff --git a/nativeLib/rary.meteorological/src/solax.f b/nativeLib/rary.meteorological/src/solax.f index e41240ad41..8d7a4a8602 100755 --- a/nativeLib/rary.meteorological/src/solax.f +++ b/nativeLib/rary.meteorological/src/solax.f @@ -1,9 +1,9 @@ SUBROUTINE SOLAX ( JULDAY, !Julian day (ddd) - . MONTH, !Month number of year - . SLAT, !Station latitude (deg) - . TYMINC, !Summation time increment (min) - . TSTART, !Local time to start summation (hr) - . TSTOP, !Local time (24 hr clock) to stop + . MONTH, !Month number of year + . SLAT, !Station latitude (deg) + . TYMINC, !Summation time increment (min) + . TSTART, !Local time to start summation (hr) + . TSTOP, !Local time (24 hr clock) to stop . TSRAD) !Output: solar rad. @ top of atm (ly) C========================================================================== @@ -41,9 +41,9 @@ c ---------------- . .196,.205,.207,.201, . .177,.160,.149,.142/, - . SDF /.058,.060,.071,.097, - . .121,.134,.136,.122, - . .092,.073,.063,.057/ + . SDF /.058,.060,.071,.097, + . .121,.134,.136,.122, + . .092,.073,.063,.057/ C--------------------------------------------------------------------------- diff --git a/nativeLib/rary.ohd.pproc/.cproject b/nativeLib/rary.ohd.pproc/.cproject index 491f807a58..615d1b8513 100644 --- a/nativeLib/rary.ohd.pproc/.cproject +++ b/nativeLib/rary.ohd.pproc/.cproject @@ -1,359 +1,359 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/nativeLib/rary.wfoapi.getTestMode/.cproject b/nativeLib/rary.wfoapi.getTestMode/.cproject index d91c8ab1ab..1c819a935a 100644 --- a/nativeLib/rary.wfoapi.getTestMode/.cproject +++ b/nativeLib/rary.wfoapi.getTestMode/.cproject @@ -1,951 +1,535 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/nativeLib/rary.wfoapi.getTestMode/src/getTestMode.C b/nativeLib/rary.wfoapi.getTestMode/src/getTestMode.C index 49ce749a1c..5996e9453c 100644 --- a/nativeLib/rary.wfoapi.getTestMode/src/getTestMode.C +++ b/nativeLib/rary.wfoapi.getTestMode/src/getTestMode.C @@ -102,7 +102,6 @@ #include #include #include -#include "LogStream.H" #include "testmode.H" #define DEVRUN true @@ -209,7 +208,7 @@ int main(int argc, char *argv[]) int rc = 0; int runLocal = 0; // Meaning both xt and lx workstations are present - logVerbose << "Startup" << std::endl; + std::cout << "Startup" << std::endl; if (argc > 3) ExitWithHelp(); diff --git a/nativeLib/rary.wfoapi.getTestMode/src/sockhelp.C b/nativeLib/rary.wfoapi.getTestMode/src/sockhelp.C index 184ce9be38..22b1a0b008 100644 --- a/nativeLib/rary.wfoapi.getTestMode/src/sockhelp.C +++ b/nativeLib/rary.wfoapi.getTestMode/src/sockhelp.C @@ -8,6 +8,7 @@ // ---************************************************************************* #include #include +#include #include #include #include @@ -15,7 +16,6 @@ #include #include #include "sockhelp.H" -#include "LogStream.H" #include "testmode.H" // +++ Function Name: atoport @@ -263,7 +263,7 @@ int getTestModeQuery(char *hostname, int port) ssize_t status = -1; sock = make_connection(DEFAULT_PORT_NUM, SOCK_STREAM, hostname, port); - logVerbose << "Connected on socket " << sock << std::endl; + std::cout << "Connected on socket " << sock << std::endl; if (sock == -1) { close(sock); return OPERATION_MODE; @@ -273,13 +273,13 @@ int getTestModeQuery(char *hostname, int port) sprintf(input_buf.msg,"RequestForTestModeInfo"); send(sock,(const void*) &input_buf, sizeof(input_buf),0); - logVerbose << "Sent socket msg """ << input_buf.msg << """" << std::endl; + std::cout << "Sent socket msg """ << input_buf.msg << """" << std::endl; status = recv(sock, (void*) &output_buf,sizeof(output_buf),0); close(sock); if (status != -1) { - logVerbose << "Received socket msg """ << output_buf.msg + std::cout << "Received socket msg """ << output_buf.msg << """" << std::endl; if (strcmp(output_buf.msg,"Test")== 0) { return TEST_MODE; @@ -296,7 +296,7 @@ int getTestModeQuery(char *hostname, int port) } else { - logVerbose << "Warning - No socket msg was received; everything will crash!" << std::endl; + std::cout << "Warning - No socket msg was received; everything will crash!" << std::endl; return PANIC_MODE; } } diff --git a/nativeLib/rary.wfoapi.showBanner/src/showBanner.C b/nativeLib/rary.wfoapi.showBanner/src/showBanner.C index cafc341753..d3b4265403 100644 --- a/nativeLib/rary.wfoapi.showBanner/src/showBanner.C +++ b/nativeLib/rary.wfoapi.showBanner/src/showBanner.C @@ -24,7 +24,6 @@ #include // for signal #include "tmbUtil.H" #include "testmode.H" -#include "LogStream.H" #define MAX_DISPLAYS 5 #define FONT_NAME "-*-helvetica-bold-r-normal--12-*" #define INTERVAL 2000 // number of milliseconds to go off diff --git a/nativeLib/rary.wfoapi.test_WorkstationTestMode/.cproject b/nativeLib/rary.wfoapi.test_WorkstationTestMode/.cproject index 630423a47f..7aa9f94cc7 100644 --- a/nativeLib/rary.wfoapi.test_WorkstationTestMode/.cproject +++ b/nativeLib/rary.wfoapi.test_WorkstationTestMode/.cproject @@ -1,952 +1,536 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/nativeLib/rary.wfoapi.test_WorkstationTestMode/src/sockhelp.C b/nativeLib/rary.wfoapi.test_WorkstationTestMode/src/sockhelp.C index 184ce9be38..22b1a0b008 100644 --- a/nativeLib/rary.wfoapi.test_WorkstationTestMode/src/sockhelp.C +++ b/nativeLib/rary.wfoapi.test_WorkstationTestMode/src/sockhelp.C @@ -8,6 +8,7 @@ // ---************************************************************************* #include #include +#include #include #include #include @@ -15,7 +16,6 @@ #include #include #include "sockhelp.H" -#include "LogStream.H" #include "testmode.H" // +++ Function Name: atoport @@ -263,7 +263,7 @@ int getTestModeQuery(char *hostname, int port) ssize_t status = -1; sock = make_connection(DEFAULT_PORT_NUM, SOCK_STREAM, hostname, port); - logVerbose << "Connected on socket " << sock << std::endl; + std::cout << "Connected on socket " << sock << std::endl; if (sock == -1) { close(sock); return OPERATION_MODE; @@ -273,13 +273,13 @@ int getTestModeQuery(char *hostname, int port) sprintf(input_buf.msg,"RequestForTestModeInfo"); send(sock,(const void*) &input_buf, sizeof(input_buf),0); - logVerbose << "Sent socket msg """ << input_buf.msg << """" << std::endl; + std::cout << "Sent socket msg """ << input_buf.msg << """" << std::endl; status = recv(sock, (void*) &output_buf,sizeof(output_buf),0); close(sock); if (status != -1) { - logVerbose << "Received socket msg """ << output_buf.msg + std::cout << "Received socket msg """ << output_buf.msg << """" << std::endl; if (strcmp(output_buf.msg,"Test")== 0) { return TEST_MODE; @@ -296,7 +296,7 @@ int getTestModeQuery(char *hostname, int port) } else { - logVerbose << "Warning - No socket msg was received; everything will crash!" << std::endl; + std::cout << "Warning - No socket msg was received; everything will crash!" << std::endl; return PANIC_MODE; } } diff --git a/nativeLib/rary.wfoapi.tmb/.cproject b/nativeLib/rary.wfoapi.tmb/.cproject index 837dc769b2..6cbef15b29 100644 --- a/nativeLib/rary.wfoapi.tmb/.cproject +++ b/nativeLib/rary.wfoapi.tmb/.cproject @@ -1,953 +1,536 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/nativeLib/rary.wfoapi.tmb/src/sockhelp.C b/nativeLib/rary.wfoapi.tmb/src/sockhelp.C index 184ce9be38..22b1a0b008 100644 --- a/nativeLib/rary.wfoapi.tmb/src/sockhelp.C +++ b/nativeLib/rary.wfoapi.tmb/src/sockhelp.C @@ -8,6 +8,7 @@ // ---************************************************************************* #include #include +#include #include #include #include @@ -15,7 +16,6 @@ #include #include #include "sockhelp.H" -#include "LogStream.H" #include "testmode.H" // +++ Function Name: atoport @@ -263,7 +263,7 @@ int getTestModeQuery(char *hostname, int port) ssize_t status = -1; sock = make_connection(DEFAULT_PORT_NUM, SOCK_STREAM, hostname, port); - logVerbose << "Connected on socket " << sock << std::endl; + std::cout << "Connected on socket " << sock << std::endl; if (sock == -1) { close(sock); return OPERATION_MODE; @@ -273,13 +273,13 @@ int getTestModeQuery(char *hostname, int port) sprintf(input_buf.msg,"RequestForTestModeInfo"); send(sock,(const void*) &input_buf, sizeof(input_buf),0); - logVerbose << "Sent socket msg """ << input_buf.msg << """" << std::endl; + std::cout << "Sent socket msg """ << input_buf.msg << """" << std::endl; status = recv(sock, (void*) &output_buf,sizeof(output_buf),0); close(sock); if (status != -1) { - logVerbose << "Received socket msg """ << output_buf.msg + std::cout << "Received socket msg """ << output_buf.msg << """" << std::endl; if (strcmp(output_buf.msg,"Test")== 0) { return TEST_MODE; @@ -296,7 +296,7 @@ int getTestModeQuery(char *hostname, int port) } else { - logVerbose << "Warning - No socket msg was received; everything will crash!" << std::endl; + std::cout << "Warning - No socket msg was received; everything will crash!" << std::endl; return PANIC_MODE; } } diff --git a/nativeLib/rary.wfoapi.tmb_exit/.cproject b/nativeLib/rary.wfoapi.tmb_exit/.cproject index eb097f7f77..c6bf784845 100644 --- a/nativeLib/rary.wfoapi.tmb_exit/.cproject +++ b/nativeLib/rary.wfoapi.tmb_exit/.cproject @@ -1,951 +1,535 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/nativeLib/rary.wfoapi.tmb_exit/src/sockhelp.C b/nativeLib/rary.wfoapi.tmb_exit/src/sockhelp.C index 184ce9be38..22b1a0b008 100644 --- a/nativeLib/rary.wfoapi.tmb_exit/src/sockhelp.C +++ b/nativeLib/rary.wfoapi.tmb_exit/src/sockhelp.C @@ -8,6 +8,7 @@ // ---************************************************************************* #include #include +#include #include #include #include @@ -15,7 +16,6 @@ #include #include #include "sockhelp.H" -#include "LogStream.H" #include "testmode.H" // +++ Function Name: atoport @@ -263,7 +263,7 @@ int getTestModeQuery(char *hostname, int port) ssize_t status = -1; sock = make_connection(DEFAULT_PORT_NUM, SOCK_STREAM, hostname, port); - logVerbose << "Connected on socket " << sock << std::endl; + std::cout << "Connected on socket " << sock << std::endl; if (sock == -1) { close(sock); return OPERATION_MODE; @@ -273,13 +273,13 @@ int getTestModeQuery(char *hostname, int port) sprintf(input_buf.msg,"RequestForTestModeInfo"); send(sock,(const void*) &input_buf, sizeof(input_buf),0); - logVerbose << "Sent socket msg """ << input_buf.msg << """" << std::endl; + std::cout << "Sent socket msg """ << input_buf.msg << """" << std::endl; status = recv(sock, (void*) &output_buf,sizeof(output_buf),0); close(sock); if (status != -1) { - logVerbose << "Received socket msg """ << output_buf.msg + std::cout << "Received socket msg """ << output_buf.msg << """" << std::endl; if (strcmp(output_buf.msg,"Test")== 0) { return TEST_MODE; @@ -296,7 +296,7 @@ int getTestModeQuery(char *hostname, int port) } else { - logVerbose << "Warning - No socket msg was received; everything will crash!" << std::endl; + std::cout << "Warning - No socket msg was received; everything will crash!" << std::endl; return PANIC_MODE; } } diff --git a/nativeLib/rary.wfoapi.tmcp/src/tmcp.C b/nativeLib/rary.wfoapi.tmcp/src/tmcp.C index 4a061cd422..6120756a48 100644 --- a/nativeLib/rary.wfoapi.tmcp/src/tmcp.C +++ b/nativeLib/rary.wfoapi.tmcp/src/tmcp.C @@ -900,7 +900,7 @@ static void events_handler( Widget w, XtPointer client_data, XtPointer call_data { int rc; int pc; // pre-condition flag - int which = (int) client_data; + int which = (long) client_data; XmString label; XmString button_label; char command[512];