diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/jtutil/array.cc | 10 | ||||
-rw-r--r-- | src/jtutil/array.hh | 8 | ||||
-rw-r--r-- | src/jtutil/cpm_map.cc | 6 | ||||
-rw-r--r-- | src/jtutil/cpm_map.hh | 3 | ||||
-rw-r--r-- | src/jtutil/error_exit.c | 2 | ||||
-rw-r--r-- | src/jtutil/fuzzy.cc | 4 | ||||
-rw-r--r-- | src/jtutil/linear_map.cc | 6 | ||||
-rw-r--r-- | src/jtutil/linear_map.hh | 3 | ||||
-rw-r--r-- | src/jtutil/makefile | 6 | ||||
-rw-r--r-- | src/jtutil/norm.cc | 2 | ||||
-rw-r--r-- | src/jtutil/round.cc | 4 | ||||
-rw-r--r-- | src/jtutil/test_array.cc | 10 | ||||
-rw-r--r-- | src/jtutil/test_array2.cc | 6 | ||||
-rw-r--r-- | src/jtutil/test_cpm_map.cc | 6 | ||||
-rw-r--r-- | src/jtutil/test_fuzzy.cc | 4 | ||||
-rw-r--r-- | src/jtutil/test_linear_map.cc | 6 | ||||
-rw-r--r-- | src/jtutil/test_modulo.cc | 4 | ||||
-rw-r--r-- | src/jtutil/test_norm.cc | 4 | ||||
-rw-r--r-- | src/jtutil/test_round.cc | 4 | ||||
-rw-r--r-- | src/jtutil/util.hh | 7 |
20 files changed, 56 insertions, 49 deletions
diff --git a/src/jtutil/array.cc b/src/jtutil/array.cc index 7211d72..62bb530 100644 --- a/src/jtutil/array.cc +++ b/src/jtutil/array.cc @@ -16,12 +16,12 @@ // ***** template instantiations ***** // -#include <cassert> -#include <cstddef> // for NULL +#include <assert.h> +#include <stddef.h> // for NULL -#include "jt/stdc.h" -#include "jt/util.hh" -#include "jt/array.hh" +#include "stdc.h" +#include "util.hh" +#include "array.hh" //****************************************************************************** //****************************************************************************** diff --git a/src/jtutil/array.hh b/src/jtutil/array.hh index 253d785..dbe997f 100644 --- a/src/jtutil/array.hh +++ b/src/jtutil/array.hh @@ -9,10 +9,10 @@ // // prerequisites: -// <cassert> -// <cstddef> // for NULL -// "jt/stdc.h" -// "jt/util++.h" // for jtutil::how_many_in_range() +// <assert.h> +// <stddef.h> // for NULL +// "stdc.h" +// "util.hh" // for jtutil::how_many_in_range() // // diff --git a/src/jtutil/cpm_map.cc b/src/jtutil/cpm_map.cc index bb96bf1..6f84307 100644 --- a/src/jtutil/cpm_map.cc +++ b/src/jtutil/cpm_map.cc @@ -10,9 +10,9 @@ #include <assert.h> #include <stdio.h> -#include "jt/stdc.h" -#include "jt/util.hh" -#include "jt/cpm_map.hh" +#include "stdc.h" +#include "util.hh" +#include "cpm_map.hh" using jtutil::error_exit; //****************************************************************************** diff --git a/src/jtutil/cpm_map.hh b/src/jtutil/cpm_map.hh index 5031111..dacd715 100644 --- a/src/jtutil/cpm_map.hh +++ b/src/jtutil/cpm_map.hh @@ -7,7 +7,8 @@ // // prerequisites // <assert.h> -// "jt/util.hh" // for jtutil::how_many_in_range() +// "stdc.h" +// "util.hh" // for jtutil::how_many_in_range() // // diff --git a/src/jtutil/error_exit.c b/src/jtutil/error_exit.c index a2a4626..26acdf7 100644 --- a/src/jtutil/error_exit.c +++ b/src/jtutil/error_exit.c @@ -8,7 +8,7 @@ #include <stdarg.h> #include <stdlib.h> -#include "jt/stdc.h" +#include "stdc.h" /*****************************************************************************/ diff --git a/src/jtutil/fuzzy.cc b/src/jtutil/fuzzy.cc index d71a873..9652618 100644 --- a/src/jtutil/fuzzy.cc +++ b/src/jtutil/fuzzy.cc @@ -11,8 +11,8 @@ // #include <algorithm> -#include "jt/stdc.h" -#include "jt/util.hh" +#include "stdc.h" +#include "util.hh" //****************************************************************************** diff --git a/src/jtutil/linear_map.cc b/src/jtutil/linear_map.cc index 75bacb1..55ec8af 100644 --- a/src/jtutil/linear_map.cc +++ b/src/jtutil/linear_map.cc @@ -12,9 +12,9 @@ #include <assert.h> #include <stdio.h> -#include "jt/stdc.h" -#include "jt/util.hh" -#include "jt/linear_map.hh" +#include "stdc.h" +#include "util.hh" +#include "linear_map.hh" using jtutil::error_exit; //****************************************************************************** diff --git a/src/jtutil/linear_map.hh b/src/jtutil/linear_map.hh index 3d6cd42..59cdbdf 100644 --- a/src/jtutil/linear_map.hh +++ b/src/jtutil/linear_map.hh @@ -7,7 +7,8 @@ // // prerequisites // <assert.h> -// <jt/util.hh> // for jtutil::how_many_in_range() and fuzzy:: +// "stdc.h" +// "util.hh" // for jtutil::how_many_in_range() and fuzzy:: // // diff --git a/src/jtutil/makefile b/src/jtutil/makefile index 0669ac4..b9541c0 100644 --- a/src/jtutil/makefile +++ b/src/jtutil/makefile @@ -1,5 +1,5 @@ # Makefile for standalone test drivers in this directory -# $Id: makefile,v 1.3 2002-04-10 14:03:04 jthorn Exp $ +# $Id: makefile,v 1.4 2002-06-24 16:15:42 jthorn Exp $ # # CC, CXX = C and C++ compilers. Defaults are gcc and g++ if # variables aren't set from command line or environment. @@ -19,8 +19,8 @@ # CXX := g++ -CFLAGS := $(STD_GCC_FLAGS) -I.. -g -CXXFLAGS := $(STD_GXX_FLAGS) -I.. -g +CFLAGS := $(STD_GCC_FLAGS) -I../include -g +CXXFLAGS := $(STD_GXX_FLAGS) -I../include -g ALL_TESTS := test_array test_array2 \ test_cpm_map test_linear_map \ diff --git a/src/jtutil/norm.cc b/src/jtutil/norm.cc index d6f0baf..118225d 100644 --- a/src/jtutil/norm.cc +++ b/src/jtutil/norm.cc @@ -9,7 +9,7 @@ #include <algorithm> #include <assert.h> -#include "jt/util.hh" +#include "util.hh" //***************************************************************************** diff --git a/src/jtutil/round.cc b/src/jtutil/round.cc index 123eb48..06309b6 100644 --- a/src/jtutil/round.cc +++ b/src/jtutil/round.cc @@ -9,8 +9,8 @@ // ***** template instantiations ***** // -#include "jt/stdc.h" -#include "jt/util.hh" +#include "stdc.h" +#include "util.hh" //****************************************************************************** //****************************************************************************** diff --git a/src/jtutil/test_array.cc b/src/jtutil/test_array.cc index 3200284..1db587a 100644 --- a/src/jtutil/test_array.cc +++ b/src/jtutil/test_array.cc @@ -1,14 +1,14 @@ // test_array.cc -- test driver for array.hh classes // $Id$ -#include <cassert> +#include <assert.h> +#include <stdio.h> #include <math.h> -#include <cstdio> using std::printf; -#include "jt/stdc.h" -#include "jt/util.hh" -#include "jt/array.hh" +#include "stdc.h" +#include "util.hh" +#include "array.hh" using jtutil::fuzzy; using jtutil::array1d; diff --git a/src/jtutil/test_array2.cc b/src/jtutil/test_array2.cc index 555c684..2e99ae1 100644 --- a/src/jtutil/test_array2.cc +++ b/src/jtutil/test_array2.cc @@ -5,9 +5,9 @@ #include <math.h> #include <stdio.h> -#include "jt/stdc.h" -#include "jt/util.hh" -#include "jt/array.hh" +#include "stdc.h" +#include "util.hh" +#include "array.hh" void print( jtutil::array2d<double>& Aref); void cprint(const jtutil::array2d<double>& Aref); diff --git a/src/jtutil/test_cpm_map.cc b/src/jtutil/test_cpm_map.cc index aa1b724..e9098e3 100644 --- a/src/jtutil/test_cpm_map.cc +++ b/src/jtutil/test_cpm_map.cc @@ -3,9 +3,9 @@ #include <assert.h> #include <stdio.h> -#include "jt/stdc.h" -#include "jt/util.hh" -#include "jt/cpm_map.hh" +#include "stdc.h" +#include "util.hh" +#include "cpm_map.hh" using jtutil::cpm_map; //****************************************************************************** diff --git a/src/jtutil/test_fuzzy.cc b/src/jtutil/test_fuzzy.cc index b877adc..8620a07 100644 --- a/src/jtutil/test_fuzzy.cc +++ b/src/jtutil/test_fuzzy.cc @@ -9,8 +9,8 @@ #include <stdio.h> #include <assert.h> -#include "jt/stdc.h" -#include "jt/util.hh" +#include "stdc.h" +#include "util.hh" using jtutil::error_exit; using jtutil::fuzzy; diff --git a/src/jtutil/test_linear_map.cc b/src/jtutil/test_linear_map.cc index 9963daf..a35f40f 100644 --- a/src/jtutil/test_linear_map.cc +++ b/src/jtutil/test_linear_map.cc @@ -3,9 +3,9 @@ #include <assert.h> #include <stdio.h> -#include "jt/stdc.h" -#include "jt/util.hh" -#include "jt/linear_map.hh" +#include "stdc.h" +#include "util.hh" +#include "linear_map.hh" using jtutil::fuzzy; using jtutil::linear_map; diff --git a/src/jtutil/test_modulo.cc b/src/jtutil/test_modulo.cc index 912dc1b..a4b2198 100644 --- a/src/jtutil/test_modulo.cc +++ b/src/jtutil/test_modulo.cc @@ -3,8 +3,8 @@ #include <stdio.h> #include <assert.h> -#include "jt/stdc.h" -#include "jt/util.hh" +#include "stdc.h" +#include "util.hh" using jtutil::error_exit; using jtutil::fuzzy; diff --git a/src/jtutil/test_norm.cc b/src/jtutil/test_norm.cc index 77100cb..fb24344 100644 --- a/src/jtutil/test_norm.cc +++ b/src/jtutil/test_norm.cc @@ -7,8 +7,8 @@ using std::printf; using std::sqrt; -#include "jt/stdc.h" -#include "jt/util.hh" +#include "stdc.h" +#include "util.hh" using jtutil::norm; using jtutil::fuzzy; diff --git a/src/jtutil/test_round.cc b/src/jtutil/test_round.cc index 9bcc280..630cc7d 100644 --- a/src/jtutil/test_round.cc +++ b/src/jtutil/test_round.cc @@ -3,8 +3,8 @@ #include <stdio.h> #include <assert.h> -#include "jt/stdc.h" -#include "jt/util.hh" +#include "stdc.h" +#include "util.hh" using jtutil::round; // diff --git a/src/jtutil/util.hh b/src/jtutil/util.hh index 75c380b..6873e62 100644 --- a/src/jtutil/util.hh +++ b/src/jtutil/util.hh @@ -9,6 +9,11 @@ // jtutil::round::<fp> - floating point rounding // +// +// prerequisites: +// "stdc.h" +// + namespace jtutil { @@ -176,4 +181,4 @@ public: //****************************************************************************** - } // namespace jtutil:: + } // namespace jtutil |