From 5701f87232bac08ca33ef3f4d0fe2d07484fefd5 Mon Sep 17 00:00:00 2001 From: Scott R Charlton Date: Fri, 21 May 2010 07:51:45 +0000 Subject: [PATCH] got rid of some warnings git-svn-id: svn://136.177.114.72/svn_GW/IPhreeqc/trunk@4453 1feff8c3-07ed-0310-ac33-dd36852eb9cd --- doc/examples/F90ClearAccumulatedLines.f90 | 1 - doc/examples/F90GetSelectedOutputValue.f90 | 4 ++++ doc/examples/GetSelectedOutputValue.c | 7 ++++++- doc/examples/Makefile | 4 ++-- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/doc/examples/F90ClearAccumulatedLines.f90 b/doc/examples/F90ClearAccumulatedLines.f90 index e4a86bc6..bc8f6cd2 100644 --- a/doc/examples/F90ClearAccumulatedLines.f90 +++ b/doc/examples/F90ClearAccumulatedLines.f90 @@ -1,7 +1,6 @@ PROGRAM example INCLUDE "IPhreeqc.f90.inc" INTEGER(KIND=4) :: id - INTEGER(KIND=4) :: i id = CreateIPhreeqc() IF (id.LT.0) THEN diff --git a/doc/examples/F90GetSelectedOutputValue.f90 b/doc/examples/F90GetSelectedOutputValue.f90 index d574009b..d76a3833 100644 --- a/doc/examples/F90GetSelectedOutputValue.f90 +++ b/doc/examples/F90GetSelectedOutputValue.f90 @@ -35,4 +35,8 @@ PROGRAM example END DO WRITE(*,*) END DO + + IF (DestroyIPhreeqc(id).NE.IPQ_OK) THEN + STOP + END IF END PROGRAM example diff --git a/doc/examples/GetSelectedOutputValue.c b/doc/examples/GetSelectedOutputValue.c index 873a45bb..0d9cb689 100644 --- a/doc/examples/GetSelectedOutputValue.c +++ b/doc/examples/GetSelectedOutputValue.c @@ -30,7 +30,7 @@ int main(void) if (GetSelectedOutputValue(id, i, j, &v) == VR_OK) { switch (v.type) { case TT_LONG: - printf("%d ", v.lVal); + printf("%ld ", v.lVal); break; case TT_DOUBLE: printf("%g ", v.dVal); @@ -44,5 +44,10 @@ int main(void) } printf("\n"); } + + if (DestroyIPhreeqc(id)) { + return EXIT_FAILURE; + } + return EXIT_SUCCESS; } diff --git a/doc/examples/Makefile b/doc/examples/Makefile index 0a378832..4838e3c1 100644 --- a/doc/examples/Makefile +++ b/doc/examples/Makefile @@ -4,8 +4,8 @@ CXX = g++ DEFS = -DNDEBUG=1 -DFC_FUNC\(name,NAME\)=name\ \#\#\ _ -DFC_FUNC_\(name,NAME\)=name\ \#\#\ _ -DFC_MAIN=MAIN__ F77 = gfortran FC = gfortran -CFLAGS = -g -O2 -FFLAGS = -I../../include -g -O2 +CFLAGS = -g -O2 -Wall +FFLAGS = -I../../include -g -O2 -Wall FCLIBS = -L/usr/lib/gcc/i586-manbo-linux-gnu/4.4.1 -L/usr/lib/gcc/i586-manbo-linux-gnu/4.4.1/../../.. -lgfortranbegin -lgfortran -lm LIBTOOL = /bin/sh ../../_build/libtool LDFLAGS =