From bfa29ec02bae01f36b130d89c8f0b89db145d2a9 Mon Sep 17 00:00:00 2001 From: Jeff Hill Date: Fri, 13 Jun 1997 17:42:53 +0000 Subject: [PATCH] fixed tests --- src/cxxTemplates/test/Makefile.Host | 2 ++ src/cxxTemplates/test/minmaxTest.cc | 8 ++++---- src/libCom/cxxTemplates/test/minmaxTest.cc | 8 ++++---- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/cxxTemplates/test/Makefile.Host b/src/cxxTemplates/test/Makefile.Host index 9453b5774..dc5cbbbab 100644 --- a/src/cxxTemplates/test/Makefile.Host +++ b/src/cxxTemplates/test/Makefile.Host @@ -4,6 +4,8 @@ include $(TOP)/config/CONFIG_BASE CXXCMPLR = STRICT +PROD_LIBS = Com + TESTPROD := resourceLibTest tsDLListBench tsDLListTest tsDLListTest \ tsSLListBench tsSLListTest minmaxTest tsBTreeBench tsBTreeTest diff --git a/src/cxxTemplates/test/minmaxTest.cc b/src/cxxTemplates/test/minmaxTest.cc index 6905e21d0..828c0e117 100644 --- a/src/cxxTemplates/test/minmaxTest.cc +++ b/src/cxxTemplates/test/minmaxTest.cc @@ -9,20 +9,20 @@ main () float f2 = 3.4; float f3; - f3 = min(f1,f2); + f3 = tsMin(f1,f2); assert(f3==f1); - f3 = max(f1,f2); + f3 = tsMax(f1,f2); assert(f3==f2); int i1 = 3; int i2 = 4; int i3; - i3 = min(i1,i2); + i3 = tsMin(i1,i2); assert(i3==i1); - i3 = max(i1,i2); + i3 = tsMax(i1,i2); assert(i3==i2); } diff --git a/src/libCom/cxxTemplates/test/minmaxTest.cc b/src/libCom/cxxTemplates/test/minmaxTest.cc index 6905e21d0..828c0e117 100644 --- a/src/libCom/cxxTemplates/test/minmaxTest.cc +++ b/src/libCom/cxxTemplates/test/minmaxTest.cc @@ -9,20 +9,20 @@ main () float f2 = 3.4; float f3; - f3 = min(f1,f2); + f3 = tsMin(f1,f2); assert(f3==f1); - f3 = max(f1,f2); + f3 = tsMax(f1,f2); assert(f3==f2); int i1 = 3; int i2 = 4; int i3; - i3 = min(i1,i2); + i3 = tsMin(i1,i2); assert(i3==i1); - i3 = max(i1,i2); + i3 = tsMax(i1,i2); assert(i3==i2); }