diff options
| author | jthorn <jthorn@f88db872-0e4f-0410-b76b-b9085cfa78c5> | 2002-10-11 17:35:11 +0000 |
|---|---|---|
| committer | jthorn <jthorn@f88db872-0e4f-0410-b76b-b9085cfa78c5> | 2002-10-11 17:35:11 +0000 |
| commit | 0551473f2d6a0e8f6dbcfc0e642c1db142b15e37 (patch) | |
| tree | 17ffd59cd3d19f4ca08483e7a8e93aec63af2f0a /src/jtutil | |
| parent | aa5bf44a0ad0b5bdb40b66297675be1181efd3e3 (diff) | |
back out last change for these files
> test_fuzzy.cc
> * change error_exit() call to fprintf(stderr, ...) followed by abort()
> so we don't need error_exit() and thus can compile standalone
> (error_exit() now needs "cctk.h" :( )
>
> makefile
> * remove dependence on error_exit() from test_fuzzy
since error_exit() does *NOT* actually need "cctk.h" if we compile
with -DSTANDALONE_TEST
git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/AHFinderDirect/trunk@827 f88db872-0e4f-0410-b76b-b9085cfa78c5
Diffstat (limited to 'src/jtutil')
| -rw-r--r-- | src/jtutil/makefile | 4 | ||||
| -rw-r--r-- | src/jtutil/test_fuzzy.cc | 7 |
2 files changed, 5 insertions, 6 deletions
diff --git a/src/jtutil/makefile b/src/jtutil/makefile index 3421d0a..ca3d738 100644 --- a/src/jtutil/makefile +++ b/src/jtutil/makefile @@ -1,5 +1,5 @@ # Makefile for standalone test drivers in this directory -# $Header: /usr/local/svn/cvs-repositories/numrelcvs/AEIThorns/AHFinderDirect/src/jtutil/makefile,v 1.8 2002-10-11 17:29:41 jthorn Exp $ +# $Header: /usr/local/svn/cvs-repositories/numrelcvs/AEIThorns/AHFinderDirect/src/jtutil/makefile,v 1.9 2002-10-11 17:35:11 jthorn Exp $ # # CC, CXX = C and C++ compilers. Defaults are gcc and g++ if # variables aren't set from command line or environment. @@ -40,7 +40,7 @@ test_cpm_map : test_cpm_map.o cpm_map.o \ test_linear_map : test_linear_map.o linear_map.o \ fuzzy.o round.o error_exit.o -lm test_fuzzy : test_fuzzy.o fuzzy.o \ - round.o + round.o error_exit.o test_round : test_round.o round.o test_modulo : test_modulo.o miscfp.o \ fuzzy.o round.o error_exit.o -lm diff --git a/src/jtutil/test_fuzzy.cc b/src/jtutil/test_fuzzy.cc index 2b26f25..b68d9e5 100644 --- a/src/jtutil/test_fuzzy.cc +++ b/src/jtutil/test_fuzzy.cc @@ -8,11 +8,11 @@ // *** template instantiations #include <stdio.h> -#include <stdlib.h> #include <assert.h> #include "stdc.h" #include "util.hh" +using jtutil::error_exit; using jtutil::fuzzy; // prototypes @@ -189,12 +189,11 @@ case '>': assert( fuzzy<fp>::GT(x,y) == true ); break; default: - fprintf(stderr, + error_exit(PANIC_EXIT, "***** check_binary<fp>: bad xy_relation=(int)'%c'\n" " (this should never happen!)\n" , - int(xy_relation)); - abort(); /*NOTREACHED*/ + int(xy_relation)); /*NOTREACHED*/ } } |