diff options
| author | schnetter <> | 2002-05-05 20:16:00 +0000 |
|---|---|---|
| committer | schnetter <> | 2002-05-05 20:16:00 +0000 |
| commit | bdacfc0747be4771b961b63679aeb5d48a8b520f (patch) | |
| tree | fa5596366195128a09f5c9d5df7bbb54553397e8 /Carpet | |
| parent | 5b760cbe5bd8275f23c0d9ee4d987aebd2ebeb95 (diff) | |
Removed user choice of C++ template instantiation model. In my
Removed user choice of C++ template instantiation model. In my
experience, only one model works, namely explicit template
instantiaion. No need to pretend that the other things work with
Cactus.
(Don't complain to me -- I also think it's a shame that something that
calls itself "compiler" isn't able to do this automatically. Many
other compilers for many other languages do this kind of thing without
even mentioning it. So there's either something fundamentally wrong
with the C++ standard, or with the C++ compiler writers, or with the
perceived wishlists of C++ users. And I would bet an arm and a leg
that it's not the second of these.)
darcs-hash:20020505201656-07bb3-a1b8dfc5587d59c718ad25ce89d0c8973c2b3e6f.gz
Diffstat (limited to 'Carpet')
44 files changed, 84 insertions, 250 deletions
diff --git a/Carpet/Carpet/options/carpet-harpo-gcc b/Carpet/Carpet/options/carpet-harpo-gcc index bdb26744a..31ca9544d 100644 --- a/Carpet/Carpet/options/carpet-harpo-gcc +++ b/Carpet/Carpet/options/carpet-harpo-gcc @@ -1,4 +1,4 @@ -# $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/options/carpet-harpo-gcc,v 1.2 2001/03/22 18:42:00 eschnett Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/options/carpet-harpo-gcc,v 1.3 2002/05/05 22:16:56 schnetter Exp $ CC = gcc CXX = g++ @@ -13,7 +13,7 @@ LD = g++ #LD = /u1/eschnett/bin/g++ CFLAGS = -CXXFLAGS = -DTMPL_EXPLICIT -ftemplate-depth-30 -DMPIPP_H +CXXFLAGS = -ftemplate-depth-30 -DMPIPP_H FFLAGS = F90FLAGS = diff --git a/Carpet/Carpet/options/carpet-harpo-sgi b/Carpet/Carpet/options/carpet-harpo-sgi index a7e740646..fed76b8cd 100644 --- a/Carpet/Carpet/options/carpet-harpo-sgi +++ b/Carpet/Carpet/options/carpet-harpo-sgi @@ -1,8 +1,8 @@ -# $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/options/carpet-harpo-sgi,v 1.2 2001/03/22 18:42:00 eschnett Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/options/carpet-harpo-sgi,v 1.3 2002/05/05 22:16:56 schnetter Exp $ -CPP = /lib/cpp -DTMPL_EXPLICIT -DMPIPP_H +CPP = /lib/cpp -DMPIPP_H -CXXFLAGS = -LANG:std -LANG:vla=ON -64 -mips4 -r12000 -no_auto_include -ptused -DTMPL_EXPLICIT -DMPIPP_H +CXXFLAGS = -LANG:std -LANG:vla=ON -64 -mips4 -r12000 -no_auto_include -ptused -DMPIPP_H LDFLAGS = -LANG:std -LANG:vla=ON -64 -mips4 -r12000 -Wl,"-woff 84","-woff 85" C_OPTIMISE_FLAGS = -O3 -INLINE -LNO -OPT:Olimit=100000 diff --git a/Carpet/Carpet/options/carpet-hawaii-sgi b/Carpet/Carpet/options/carpet-hawaii-sgi index 2a9e1317e..0e3340c47 100644 --- a/Carpet/Carpet/options/carpet-hawaii-sgi +++ b/Carpet/Carpet/options/carpet-hawaii-sgi @@ -1,8 +1,8 @@ -# $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/options/carpet-hawaii-sgi,v 1.1 2001/03/27 22:26:31 eschnett Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/options/carpet-hawaii-sgi,v 1.2 2002/05/05 22:16:56 schnetter Exp $ -CPP = /lib/cpp -DTMPL_EXPLICIT -DMPIPP_H +CPP = /lib/cpp -DMPIPP_H -CXXFLAGS = -LANG:std -LANG:vla=ON -FE:eliminate_duplicate_inline_copies -FE:template_in_elf_section -64 -mips4 -r12000 -no_auto_include -ptused -DTMPL_EXPLICIT -DMPIPP_H +CXXFLAGS = -LANG:std -LANG:vla=ON -FE:eliminate_duplicate_inline_copies -FE:template_in_elf_section -64 -mips4 -r12000 -no_auto_include -ptused -DMPIPP_H LDFLAGS = -LANG:std -LANG:vla=ON -64 -mips4 -r12000 -Wl,"-woff 84","-woff 85" C_OPTIMISE_FLAGS = -O3 -INLINE -LNO -OPT:Olimit=100000 diff --git a/Carpet/Carpet/options/carpet-lilypond b/Carpet/Carpet/options/carpet-lilypond index de4f20eb0..676b38139 100644 --- a/Carpet/Carpet/options/carpet-lilypond +++ b/Carpet/Carpet/options/carpet-lilypond @@ -1,10 +1,10 @@ -# $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/options/carpet-lilypond,v 1.7 2001/11/14 17:57:54 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/options/carpet-lilypond,v 1.8 2002/05/05 22:16:57 schnetter Exp $ -CPP = cpp -traditional -DTMPL_EXPLICIT -DCARPET_REAL +CPP = cpp -traditional -DCARPET_REAL F77 = g77 F90 = g77 -CXXFLAGS = -DTMPL_EXPLICIT -DCARPET_REAL -ftemplate-depth-30 +CXXFLAGS = -DCARPET_REAL -ftemplate-depth-30 C_OPTIMISE_FLAGS = -O2 -funroll-loops -march=pentiumpro CXX_OPTIMISE_FLAGS = -O2 -funroll-loops -march=pentiumpro diff --git a/Carpet/Carpet/options/carpet-lilypond-gcc3 b/Carpet/Carpet/options/carpet-lilypond-gcc3 index d620e30bd..2d188906b 100644 --- a/Carpet/Carpet/options/carpet-lilypond-gcc3 +++ b/Carpet/Carpet/options/carpet-lilypond-gcc3 @@ -1,13 +1,13 @@ -# $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/options/Attic/carpet-lilypond-gcc3,v 1.4 2002/03/06 17:47:57 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/options/Attic/carpet-lilypond-gcc3,v 1.5 2002/05/05 22:16:57 schnetter Exp $ -CPP = /home/eschnett/gcc/bin/cpp -traditional -DTMPL_EXPLICIT -DCARPET_REAL +CPP = /home/eschnett/gcc/bin/cpp -traditional -DCARPET_REAL CC = /home/eschnett/gcc/bin/gcc CXX = /home/eschnett/gcc/bin/g++ F77 = /home/eschnett/gcc/bin/g77 F90 = /home/eschnett/gcc/bin/g77 CFLAGS = -fmessage-length=0 -CXXFLAGS = -fmessage-length=0 -DTMPL_EXPLICIT -DCARPET_REAL -ftemplate-depth-30 +CXXFLAGS = -fmessage-length=0 -DCARPET_REAL -ftemplate-depth-30 F77FLAGS = -fmessage-length=0 F90FLAGS = -fmessage-length=0 LDFLAGS = -Wl,-rpath,/home/eschnett/gcc/lib diff --git a/Carpet/Carpet/options/carpet-lilypond-ic b/Carpet/Carpet/options/carpet-lilypond-ic index 8481385e8..2d76afb4a 100644 --- a/Carpet/Carpet/options/carpet-lilypond-ic +++ b/Carpet/Carpet/options/carpet-lilypond-ic @@ -1,6 +1,6 @@ -# $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/options/carpet-lilypond-ic,v 1.2 2002/04/29 11:27:52 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/options/carpet-lilypond-ic,v 1.3 2002/05/05 22:16:57 schnetter Exp $ -CPP = cpp -traditional -DTMPL_EXPLICIT -DCARPET_REAL +CPP = cpp -traditional -DCARPET_REAL CC = icc CXX = icc F77 = ifc @@ -11,11 +11,11 @@ LIBDIRS = LIBS = intrins IEPCF90 F90 imf m irc cxa cprts cxa # basic -CFLAGS = -DTMPL_EXPLICIT -DCARPET_REAL -align -c99 -restrict -CXXFLAGS = -DTMPL_EXPLICIT -DCARPET_REAL -align -c99 -restrict -F90FLAGS = -DTMPL_EXPLICIT -DCARPET_REAL -align -c99 -restrict -w95 -F77FLAGS = -DTMPL_EXPLICIT -DCARPET_REAL -align -c99 -restrict -w95 -LDFLAGS = -DTMPL_EXPLICIT -DCARPET_REAL -align -c99 -restrict -g +CFLAGS = -DCARPET_REAL -align -c99 -restrict +CXXFLAGS = -DCARPET_REAL -align -c99 -restrict +F90FLAGS = -DCARPET_REAL -align -c99 -restrict -w95 +F77FLAGS = -DCARPET_REAL -align -c99 -restrict -w95 +LDFLAGS = -DCARPET_REAL -align -c99 -restrict -g # debugging DEBUG = yes diff --git a/Carpet/Carpet/options/carpet-lilypond-lf95 b/Carpet/Carpet/options/carpet-lilypond-lf95 index 24ef88eba..7e6f19604 100644 --- a/Carpet/Carpet/options/carpet-lilypond-lf95 +++ b/Carpet/Carpet/options/carpet-lilypond-lf95 @@ -1,13 +1,13 @@ -# $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/options/carpet-lilypond-lf95,v 1.4 2001/08/23 17:52:57 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/options/carpet-lilypond-lf95,v 1.5 2002/05/05 22:16:57 schnetter Exp $ LAHEY = /usr/local/lf9560 -CPP = cpp -traditional -DTMPL_EXPLICIT -DCARPET_REAL +CPP = cpp -traditional -DCARPET_REAL F77 = lf95 F90 = lf95 CFLAGS = -g3 -CXXFLAGS = -g3 -DTMPL_EXPLICIT -DCARPET_REAL -ftemplate-depth-30 +CXXFLAGS = -g3 -DCARPET_REAL -ftemplate-depth-30 F77FLAGS = --pca F90FLAGS = --pca LDFLAGS = -g3 diff --git a/Carpet/Carpet/options/carpet-lilypond-lf95-debug b/Carpet/Carpet/options/carpet-lilypond-lf95-debug index 698a59526..c872dc456 100644 --- a/Carpet/Carpet/options/carpet-lilypond-lf95-debug +++ b/Carpet/Carpet/options/carpet-lilypond-lf95-debug @@ -1,13 +1,13 @@ -# $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/options/carpet-lilypond-lf95-debug,v 1.3 2001/08/23 17:52:57 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/options/carpet-lilypond-lf95-debug,v 1.4 2002/05/05 22:16:57 schnetter Exp $ LAHEY = /usr/local/lf9560 -CPP = cpp -traditional -DTMPL_EXPLICIT -DCARPET_REAL +CPP = cpp -traditional -DCARPET_REAL F77 = lf95 F90 = lf95 CFLAGS = -g3 -CXXFLAGS = -g3 -DTMPL_EXPLICIT -DCARPET_REAL -ftemplate-depth-30 +CXXFLAGS = -g3 -DCARPET_REAL -ftemplate-depth-30 F77FLAGS = --pca F90FLAGS = --pca LDFLAGS = -g3 diff --git a/Carpet/Carpet/options/carpet-lilypond-prof b/Carpet/Carpet/options/carpet-lilypond-prof index 045b44695..1aec4c5c0 100644 --- a/Carpet/Carpet/options/carpet-lilypond-prof +++ b/Carpet/Carpet/options/carpet-lilypond-prof @@ -1,11 +1,11 @@ -# $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/options/carpet-lilypond-prof,v 1.1 2002/01/10 10:56:29 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/options/carpet-lilypond-prof,v 1.2 2002/05/05 22:16:57 schnetter Exp $ -CPP = cpp -traditional -DTMPL_EXPLICIT -DCARPET_REAL +CPP = cpp -traditional -DCARPET_REAL F77 = g77 F90 = g77 CFLAGS = -pg -CXXFLAGS = -pg -DTMPL_EXPLICIT -DCARPET_REAL -ftemplate-depth-30 +CXXFLAGS = -pg -DCARPET_REAL -ftemplate-depth-30 F77FLAGS = -pg F90FLAGS = -pg LDFLAGS = -pg diff --git a/Carpet/Carpet/options/carpet-mintaka b/Carpet/Carpet/options/carpet-mintaka index e172a7eb7..1504b4202 100644 --- a/Carpet/Carpet/options/carpet-mintaka +++ b/Carpet/Carpet/options/carpet-mintaka @@ -1,10 +1,10 @@ -# $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/options/carpet-mintaka,v 1.1 2001/11/14 17:57:55 schnetter Exp $ +# $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/options/carpet-mintaka,v 1.2 2002/05/05 22:16:57 schnetter Exp $ -CPP = cpp -traditional -DTMPL_EXPLICIT -DCARPET_REAL +CPP = cpp -traditional -DCARPET_REAL F77 = g77 F90 = g77 -CXXFLAGS = -DTMPL_EXPLICIT -DCARPET_REAL -ftemplate-depth-30 +CXXFLAGS = -DCARPET_REAL -ftemplate-depth-30 LDFLAGS = -Wl,-rpath,/home/schnette/lib C_OPTIMISE_FLAGS = -O2 -funroll-loops -march=pentiumpro diff --git a/Carpet/CarpetLib/src/bbox.cc b/Carpet/CarpetLib/src/bbox.cc index 27c1e784f..255ab88fb 100644 --- a/Carpet/CarpetLib/src/bbox.cc +++ b/Carpet/CarpetLib/src/bbox.cc @@ -5,7 +5,7 @@ copyright : (C) 2000 by Erik Schnetter email : schnetter@astro.psu.edu - $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/bbox.cc,v 1.8 2002/03/11 13:17:12 schnetter Exp $ + $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/bbox.cc,v 1.9 2002/05/05 22:16:58 schnetter Exp $ ***************************************************************************/ @@ -25,9 +25,7 @@ #include "defs.hh" #include "vect.hh" -#if !defined(TMPL_IMPLICIT) || !defined(BBOX_HH) -# include "bbox.hh" -#endif +#include "bbox.hh" using namespace std; @@ -255,11 +253,7 @@ void bbox<T,D>::output (ostream& os) const { -#if defined(TMPL_EXPLICIT) - // Note: We need all dimensions all the time. template class bbox<int,1>; template class bbox<int,2>; template class bbox<int,3>; - -#endif diff --git a/Carpet/CarpetLib/src/bbox.hh b/Carpet/CarpetLib/src/bbox.hh index 04db295db..b47f4b68f 100644 --- a/Carpet/CarpetLib/src/bbox.hh +++ b/Carpet/CarpetLib/src/bbox.hh @@ -5,7 +5,7 @@ copyright : (C) 2000 by Erik Schnetter email : schnetter@astro.psu.edu - $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/bbox.hh,v 1.9 2002/03/11 13:17:12 schnetter Exp $ + $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/bbox.hh,v 1.10 2002/05/05 22:16:58 schnetter Exp $ ***************************************************************************/ @@ -143,8 +143,4 @@ inline ostream& operator<< (ostream& os, const bbox<T,D>& b) { -#if defined(TMPL_IMPLICIT) -# include "bbox.cc" -#endif - #endif // BBOX_HH diff --git a/Carpet/CarpetLib/src/bboxset.cc b/Carpet/CarpetLib/src/bboxset.cc index 0d7522940..909c61d3a 100644 --- a/Carpet/CarpetLib/src/bboxset.cc +++ b/Carpet/CarpetLib/src/bboxset.cc @@ -5,7 +5,7 @@ copyright : (C) 2000 by Erik Schnetter email : schnetter@astro.psu.edu - $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/bboxset.cc,v 1.9 2001/12/14 16:39:41 schnetter Exp $ + $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/bboxset.cc,v 1.10 2002/05/05 22:16:58 schnetter Exp $ ***************************************************************************/ @@ -25,9 +25,7 @@ #include "defs.hh" -#if !defined(TMPL_IMPLICIT) && !defined(BBOXSET_HH) -# include "bboxset.hh" -#endif +#include "bboxset.hh" using namespace std; @@ -343,8 +341,4 @@ void bboxset<T,D>::output (ostream& os) const { -#if defined(TMPL_EXPLICIT) - template class bboxset<int,3>; - -#endif diff --git a/Carpet/CarpetLib/src/bboxset.hh b/Carpet/CarpetLib/src/bboxset.hh index 5e3cf16b2..11435d0e1 100644 --- a/Carpet/CarpetLib/src/bboxset.hh +++ b/Carpet/CarpetLib/src/bboxset.hh @@ -5,7 +5,7 @@ copyright : (C) 2000 by Erik Schnetter email : schnetter@astro.psu.edu - $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/bboxset.hh,v 1.7 2002/04/29 11:27:59 schnetter Exp $ + $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/bboxset.hh,v 1.8 2002/05/05 22:16:59 schnetter Exp $ ***************************************************************************/ @@ -170,8 +170,4 @@ inline ostream& operator<< (ostream& os, const bboxset<T,D>& s) { -#if defined(TMPL_IMPLICIT) -# include "bboxset.cc" -#endif - #endif // BBOXSET_HH diff --git a/Carpet/CarpetLib/src/data.cc b/Carpet/CarpetLib/src/data.cc index fe7fa53f8..742f388a6 100644 --- a/Carpet/CarpetLib/src/data.cc +++ b/Carpet/CarpetLib/src/data.cc @@ -5,7 +5,7 @@ copyright : (C) 2000 by Erik Schnetter email : schnetter@astro.psu.edu - $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/data.cc,v 1.16 2002/01/09 23:42:41 schnetter Exp $ + $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/data.cc,v 1.17 2002/05/05 22:16:59 schnetter Exp $ ***************************************************************************/ @@ -32,9 +32,7 @@ #include "dist.hh" #include "vect.hh" -#if !defined(TMPL_IMPLICIT) || !defined(DATA_HH) -# include "data.hh" -#endif +#include "data.hh" using namespace std; @@ -581,13 +579,9 @@ ostream& data<T,D>::output (ostream& os) const { -#if defined(TMPL_EXPLICIT) - #define INSTANTIATE(T) \ template class data<T,3>; #include "instantiate" #undef INSTANTIATE - -#endif diff --git a/Carpet/CarpetLib/src/data.hh b/Carpet/CarpetLib/src/data.hh index 3d2e1c792..983f7f141 100644 --- a/Carpet/CarpetLib/src/data.hh +++ b/Carpet/CarpetLib/src/data.hh @@ -5,7 +5,7 @@ copyright : (C) 2000 by Erik Schnetter email : schnetter@astro.psu.edu - $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/data.hh,v 1.9 2002/01/09 23:42:41 schnetter Exp $ + $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/data.hh,v 1.10 2002/05/05 22:16:59 schnetter Exp $ ***************************************************************************/ @@ -107,8 +107,4 @@ public: -#if defined(TMPL_IMPLICIT) -# include "data.cc" -#endif - #endif // DATA_HH diff --git a/Carpet/CarpetLib/src/defs.cc b/Carpet/CarpetLib/src/defs.cc index 7cf49f92a..5b79a7e4e 100644 --- a/Carpet/CarpetLib/src/defs.cc +++ b/Carpet/CarpetLib/src/defs.cc @@ -5,7 +5,7 @@ copyright : (C) 2000 by Erik Schnetter email : schnetter@astro.psu.edu - $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/defs.cc,v 1.10 2002/04/29 11:27:59 schnetter Exp $ + $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/defs.cc,v 1.11 2002/05/05 22:16:59 schnetter Exp $ ***************************************************************************/ @@ -26,9 +26,7 @@ #include <set> #include <vector> -#if !defined(TMPL_IMPLICIT) || !defined(DEFS_HH) -# include "defs.hh" -#endif +#include "defs.hh" using namespace std; @@ -106,7 +104,6 @@ ostream& output (ostream& os, const vector<T>& v) { -#if defined(TMPL_EXPLICIT) #include "bbox.hh" #include "bboxset.hh" @@ -124,4 +121,3 @@ template ostream& output (ostream& os, const vector<vector<int> >& v); template ostream& output (ostream& os, const vector<vector<bbox<int,3> > >& v); template ostream& output (ostream& os, const vector<vector<vect<vect<bool,2>,3> > >& v); template ostream& output (ostream& os, const vector<vector<vector<bbox<int,3> > > >& v); -#endif diff --git a/Carpet/CarpetLib/src/defs.hh b/Carpet/CarpetLib/src/defs.hh index 8f1810bcb..3855c814b 100644 --- a/Carpet/CarpetLib/src/defs.hh +++ b/Carpet/CarpetLib/src/defs.hh @@ -5,7 +5,7 @@ copyright : (C) 2000 by Erik Schnetter email : schnetter@astro.psu.edu - $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/defs.hh,v 1.7 2002/03/11 13:17:13 schnetter Exp $ + $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/defs.hh,v 1.8 2002/05/05 22:17:00 schnetter Exp $ ***************************************************************************/ @@ -101,8 +101,4 @@ inline ostream& operator<< (ostream& os, const vector<T>& v) { -#if defined(TMPL_IMPLICIT) -# include "defs.cc" -#endif - #endif // DEFS_HH diff --git a/Carpet/CarpetLib/src/dgdata.cc b/Carpet/CarpetLib/src/dgdata.cc index 36771e8de..e2be0a86e 100644 --- a/Carpet/CarpetLib/src/dgdata.cc +++ b/Carpet/CarpetLib/src/dgdata.cc @@ -5,7 +5,7 @@ copyright : (C) 2000 by Erik Schnetter email : schnetter@astro.psu.edu - $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/Attic/dgdata.cc,v 1.1 2001/06/12 14:56:57 schnetter Exp $ + $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/Attic/dgdata.cc,v 1.2 2002/05/05 22:17:00 schnetter Exp $ ***************************************************************************/ @@ -20,9 +20,7 @@ #include <assert.h> -#if !defined(TMPL_IMPLICIT) || !defined(GDATA_HH) -# include "dgdata.hh" -#endif +#include "dgdata.hh" using namespace std; @@ -35,8 +33,3 @@ dimgeneric_data::dimgeneric_data () // Destructors dimgeneric_data::~dimgeneric_data () { } - - - -#if defined(TMPL_EXPLICIT) -#endif diff --git a/Carpet/CarpetLib/src/dgdata.hh b/Carpet/CarpetLib/src/dgdata.hh index ae5cd89cc..89a1aa26f 100644 --- a/Carpet/CarpetLib/src/dgdata.hh +++ b/Carpet/CarpetLib/src/dgdata.hh @@ -5,7 +5,7 @@ copyright : (C) 2000 by Erik Schnetter email : schnetter@astro.psu.edu - $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/Attic/dgdata.hh,v 1.1 2001/06/12 14:56:57 schnetter Exp $ + $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/Attic/dgdata.hh,v 1.2 2002/05/05 22:17:00 schnetter Exp $ ***************************************************************************/ @@ -97,8 +97,4 @@ inline ostream& operator<< (ostream& os, const dimgeneric_data& d) { -#if defined(TMPL_IMPLICIT) -# include "dgdata.cc" -#endif - #endif // DGDATA_HH diff --git a/Carpet/CarpetLib/src/dgdh.cc b/Carpet/CarpetLib/src/dgdh.cc index 4287621c9..27cd2e335 100644 --- a/Carpet/CarpetLib/src/dgdh.cc +++ b/Carpet/CarpetLib/src/dgdh.cc @@ -6,7 +6,7 @@ copyright : (C) 2000 by Erik Schnetter email : schnetter@astro.psu.edu - $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/Attic/dgdh.cc,v 1.2 2001/12/09 16:43:09 schnetter Exp $ + $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/Attic/dgdh.cc,v 1.3 2002/05/05 22:17:00 schnetter Exp $ ***************************************************************************/ @@ -25,9 +25,7 @@ #include "dist.hh" #include "ggf.hh" -#if !defined(TMPL_IMPLICIT) || !defined(DH_HH) -# include "dgdh.hh" -#endif +#include "dgdh.hh" #undef DEBUG_OUTPUT @@ -52,8 +50,3 @@ int dimgeneric_dh::prolongation_stencil_size () const { assert (prolongation_order_space>=0); return prolongation_order_space/2; } - - - -#if defined(TMPL_EXPLICIT) -#endif diff --git a/Carpet/CarpetLib/src/dgdh.hh b/Carpet/CarpetLib/src/dgdh.hh index 222e2cfab..736e41225 100644 --- a/Carpet/CarpetLib/src/dgdh.hh +++ b/Carpet/CarpetLib/src/dgdh.hh @@ -6,7 +6,7 @@ copyright : (C) 2000 by Erik Schnetter email : schnetter@astro.psu.edu - $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/Attic/dgdh.hh,v 1.2 2001/12/09 16:43:09 schnetter Exp $ + $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/Attic/dgdh.hh,v 1.3 2002/05/05 22:17:00 schnetter Exp $ ***************************************************************************/ @@ -75,8 +75,4 @@ inline ostream& operator<< (ostream& os, const dimgeneric_dh& d) { -#if defined(TMPL_IMPLICIT) -# include "dgdh.cc" -#endif - #endif // DGDH_HH diff --git a/Carpet/CarpetLib/src/dggf.cc b/Carpet/CarpetLib/src/dggf.cc index 998c5b90e..0091fe800 100644 --- a/Carpet/CarpetLib/src/dggf.cc +++ b/Carpet/CarpetLib/src/dggf.cc @@ -6,7 +6,7 @@ copyright : (C) 2000 by Erik Schnetter email : schnetter@astro.psu.edu - $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/Attic/dggf.cc,v 1.2 2001/12/09 16:43:09 schnetter Exp $ + $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/Attic/dggf.cc,v 1.3 2002/05/05 22:17:00 schnetter Exp $ ***************************************************************************/ @@ -29,9 +29,7 @@ // #include "dh.hh" // #include "th.hh" -#if !defined(TMPL_IMPLICIT) || !defined(GGF_HH) -# include "dggf.hh" -#endif +#include "dggf.hh" using namespace std; @@ -56,8 +54,3 @@ dimgeneric_gf::~dimgeneric_gf () bool dimgeneric_gf::operator== (const dimgeneric_gf& f) const { return this == &f; } - - - -#if defined(TMPL_EXPLICIT) -#endif diff --git a/Carpet/CarpetLib/src/dggf.hh b/Carpet/CarpetLib/src/dggf.hh index 28004463e..926d76f00 100644 --- a/Carpet/CarpetLib/src/dggf.hh +++ b/Carpet/CarpetLib/src/dggf.hh @@ -6,7 +6,7 @@ copyright : (C) 2000 by Erik Schnetter email : schnetter@astro.psu.edu - $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/Attic/dggf.hh,v 1.3 2001/12/09 16:43:09 schnetter Exp $ + $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/Attic/dggf.hh,v 1.4 2002/05/05 22:17:01 schnetter Exp $ ***************************************************************************/ @@ -137,8 +137,4 @@ inline ostream& operator<< (ostream& os, const dimgeneric_gf& f) { -#if defined(TMPL_IMPLICIT) -# include "dggf.cc" -#endif - #endif // DGGF_HH diff --git a/Carpet/CarpetLib/src/dggh.cc b/Carpet/CarpetLib/src/dggh.cc index 9c6bbfd5c..f5302a740 100644 --- a/Carpet/CarpetLib/src/dggh.cc +++ b/Carpet/CarpetLib/src/dggh.cc @@ -7,7 +7,7 @@ copyright : (C) 2000 by Erik Schnetter email : schnetter@astro.psu.edu - $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/Attic/dggh.cc,v 1.1 2001/06/12 14:56:58 schnetter Exp $ + $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/Attic/dggh.cc,v 1.2 2002/05/05 22:17:01 schnetter Exp $ ***************************************************************************/ @@ -28,9 +28,7 @@ #include "dh.hh" #include "th.hh" -#if !defined(TMPL_IMPLICIT) || !defined(DGGH_HH) -# include "dggh.hh" -#endif +#include "dggh.hh" using namespace std; @@ -59,8 +57,3 @@ void dimgeneric_gh::add (th* t) { void dimgeneric_gh::remove (th* t) { ths.remove(t); } - - - -#if defined(TMPL_EXPLICIT) -#endif diff --git a/Carpet/CarpetLib/src/dggh.hh b/Carpet/CarpetLib/src/dggh.hh index 983ec73ad..13cf95f48 100644 --- a/Carpet/CarpetLib/src/dggh.hh +++ b/Carpet/CarpetLib/src/dggh.hh @@ -7,7 +7,7 @@ copyright : (C) 2001 by Erik Schnetter email : schnetter@astro.psu.edu - $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/Attic/dggh.hh,v 1.1 2001/06/12 14:56:58 schnetter Exp $ + $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/Attic/dggh.hh,v 1.2 2002/05/05 22:17:01 schnetter Exp $ ***************************************************************************/ @@ -92,8 +92,4 @@ inline ostream& operator<< (ostream& os, const dimgeneric_gh& h) { -#if defined(TMPL_IMPLICIT) -# include "dggh.cc" -#endif - #endif // DGGH_HH diff --git a/Carpet/CarpetLib/src/dh.cc b/Carpet/CarpetLib/src/dh.cc index d89ed9bc4..857ee9f56 100644 --- a/Carpet/CarpetLib/src/dh.cc +++ b/Carpet/CarpetLib/src/dh.cc @@ -6,7 +6,7 @@ copyright : (C) 2000 by Erik Schnetter email : schnetter@astro.psu.edu - $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/dh.cc,v 1.18 2002/01/09 13:56:27 schnetter Exp $ + $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/dh.cc,v 1.19 2002/05/05 22:17:01 schnetter Exp $ ***************************************************************************/ @@ -26,9 +26,7 @@ #include "ggf.hh" #include "vect.hh" -#if !defined(TMPL_IMPLICIT) || !defined(DH_HH) -# include "dh.hh" -#endif +#include "dh.hh" #undef DEBUG_OUTPUT @@ -360,6 +358,4 @@ void dh<D>::output (ostream& os) const { -#if defined(TMPL_EXPLICIT) template class dh<3>; -#endif diff --git a/Carpet/CarpetLib/src/dh.hh b/Carpet/CarpetLib/src/dh.hh index 73c2a54d6..00e9035a7 100644 --- a/Carpet/CarpetLib/src/dh.hh +++ b/Carpet/CarpetLib/src/dh.hh @@ -6,7 +6,7 @@ copyright : (C) 2000 by Erik Schnetter email : schnetter@astro.psu.edu - $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/dh.hh,v 1.9 2001/12/09 16:43:09 schnetter Exp $ + $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/dh.hh,v 1.10 2002/05/05 22:17:01 schnetter Exp $ ***************************************************************************/ @@ -127,8 +127,4 @@ public: -#if defined(TMPL_IMPLICIT) -# include "dh.cc" -#endif - #endif // DH_HH diff --git a/Carpet/CarpetLib/src/dist.cc b/Carpet/CarpetLib/src/dist.cc index 99cc2e83a..d3a242beb 100644 --- a/Carpet/CarpetLib/src/dist.cc +++ b/Carpet/CarpetLib/src/dist.cc @@ -5,7 +5,7 @@ copyright : (C) 2000 by Erik Schnetter email : schnetter@astro.psu.edu - $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/dist.cc,v 1.4 2001/03/22 18:42:05 eschnett Exp $ + $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/dist.cc,v 1.5 2002/05/05 22:17:01 schnetter Exp $ ***************************************************************************/ @@ -27,9 +27,7 @@ #include "defs.hh" -#if !defined(TMPL_IMPLICIT) || !defined(DIST_HH) -# include "dist.hh" -#endif +#include "dist.hh" using namespace std; @@ -77,8 +75,3 @@ namespace dist { } } // namespace dist - - - -#if defined(TMPL_EXPLICIT) -#endif diff --git a/Carpet/CarpetLib/src/dist.hh b/Carpet/CarpetLib/src/dist.hh index 9c488e0fd..9b56ba1c4 100644 --- a/Carpet/CarpetLib/src/dist.hh +++ b/Carpet/CarpetLib/src/dist.hh @@ -5,7 +5,7 @@ copyright : (C) 2000 by Erik Schnetter email : schnetter@astro.psu.edu - $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/dist.hh,v 1.4 2001/03/22 18:42:05 eschnett Exp $ + $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/dist.hh,v 1.5 2002/05/05 22:17:01 schnetter Exp $ ***************************************************************************/ @@ -135,8 +135,4 @@ namespace dist { -#if defined(TMPL_IMPLICIT) -# include "dist.cc" -#endif - #endif // DIST_HH diff --git a/Carpet/CarpetLib/src/gdata.cc b/Carpet/CarpetLib/src/gdata.cc index 4f59b201e..6e7df5472 100644 --- a/Carpet/CarpetLib/src/gdata.cc +++ b/Carpet/CarpetLib/src/gdata.cc @@ -5,7 +5,7 @@ copyright : (C) 2000 by Erik Schnetter email : schnetter@astro.psu.edu - $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/gdata.cc,v 1.18 2002/01/09 23:42:42 schnetter Exp $ + $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/gdata.cc,v 1.19 2002/05/05 22:17:01 schnetter Exp $ ***************************************************************************/ @@ -27,9 +27,7 @@ #include "dist.hh" #include "vect.hh" -#if !defined(TMPL_IMPLICIT) || !defined(GDATA_HH) -# include "gdata.hh" -#endif +#include "gdata.hh" using namespace std; @@ -128,8 +126,4 @@ void generic_data<D> -#if defined(TMPL_EXPLICIT) - template class generic_data<3>; - -#endif diff --git a/Carpet/CarpetLib/src/gdata.hh b/Carpet/CarpetLib/src/gdata.hh index 9b1e85555..78ca1c935 100644 --- a/Carpet/CarpetLib/src/gdata.hh +++ b/Carpet/CarpetLib/src/gdata.hh @@ -5,7 +5,7 @@ copyright : (C) 2000 by Erik Schnetter email : schnetter@astro.psu.edu - $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/gdata.hh,v 1.13 2002/01/09 23:42:42 schnetter Exp $ + $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/gdata.hh,v 1.14 2002/05/05 22:17:02 schnetter Exp $ ***************************************************************************/ @@ -117,8 +117,4 @@ protected: -#if defined(TMPL_IMPLICIT) -# include "gdata.cc" -#endif - #endif // GDATA_HH diff --git a/Carpet/CarpetLib/src/gf.cc b/Carpet/CarpetLib/src/gf.cc index 4a026a574..a7af97844 100644 --- a/Carpet/CarpetLib/src/gf.cc +++ b/Carpet/CarpetLib/src/gf.cc @@ -6,7 +6,7 @@ copyright : (C) 2000 by Erik Schnetter email : schnetter@astro.psu.edu - $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/gf.cc,v 1.8 2001/12/09 16:43:10 schnetter Exp $ + $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/gf.cc,v 1.9 2002/05/05 22:17:02 schnetter Exp $ ***************************************************************************/ @@ -23,9 +23,7 @@ #include "defs.hh" -#if !defined(TMPL_IMPLICIT) || !defined(GF_HH) -# include "gf.hh" -#endif +#include "gf.hh" using namespace std; @@ -77,13 +75,9 @@ ostream& gf<T,D>::output (ostream& os) const { -#if defined(TMPL_EXPLICIT) - #define INSTANTIATE(T) \ template class gf<T,3>; #include "instantiate" #undef INSTANTIATE - -#endif diff --git a/Carpet/CarpetLib/src/gf.hh b/Carpet/CarpetLib/src/gf.hh index df500e074..80645dd88 100644 --- a/Carpet/CarpetLib/src/gf.hh +++ b/Carpet/CarpetLib/src/gf.hh @@ -6,7 +6,7 @@ copyright : (C) 2000 by Erik Schnetter email : schnetter@astro.psu.edu - $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/gf.hh,v 1.5 2001/12/09 16:43:10 schnetter Exp $ + $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/gf.hh,v 1.6 2002/05/05 22:17:02 schnetter Exp $ ***************************************************************************/ @@ -93,8 +93,4 @@ public: -#if defined(TMPL_IMPLICIT) -# include "gf.cc" -#endif - #endif // GF_HH diff --git a/Carpet/CarpetLib/src/ggf.cc b/Carpet/CarpetLib/src/ggf.cc index 4cc2ccfae..433ad35ca 100644 --- a/Carpet/CarpetLib/src/ggf.cc +++ b/Carpet/CarpetLib/src/ggf.cc @@ -6,7 +6,7 @@ copyright : (C) 2000 by Erik Schnetter email : schnetter@astro.psu.edu - $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/ggf.cc,v 1.14 2001/12/14 16:39:42 schnetter Exp $ + $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/ggf.cc,v 1.15 2002/05/05 22:17:02 schnetter Exp $ ***************************************************************************/ @@ -29,9 +29,7 @@ #include "dh.hh" #include "th.hh" -#if !defined(TMPL_IMPLICIT) || !defined(GGF_HH) -# include "ggf.hh" -#endif +#include "ggf.hh" using namespace std; @@ -462,6 +460,4 @@ void generic_gf<D>::ref_prolongate (int tl, int rl, int c, int ml) -#if defined(TMPL_EXPLICIT) template class generic_gf<3>; -#endif diff --git a/Carpet/CarpetLib/src/ggf.hh b/Carpet/CarpetLib/src/ggf.hh index f269d1772..df785cd79 100644 --- a/Carpet/CarpetLib/src/ggf.hh +++ b/Carpet/CarpetLib/src/ggf.hh @@ -6,7 +6,7 @@ copyright : (C) 2000 by Erik Schnetter email : schnetter@astro.psu.edu - $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/ggf.hh,v 1.8 2001/12/09 16:43:10 schnetter Exp $ + $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/ggf.hh,v 1.9 2002/05/05 22:17:02 schnetter Exp $ ***************************************************************************/ @@ -201,8 +201,4 @@ inline ostream& operator<< (ostream& os, const generic_gf<D>& f) { -#if defined(TMPL_IMPLICIT) -# include "ggf.cc" -#endif - #endif // GGF_HH diff --git a/Carpet/CarpetLib/src/gh.cc b/Carpet/CarpetLib/src/gh.cc index c0cd6df08..26f605de7 100644 --- a/Carpet/CarpetLib/src/gh.cc +++ b/Carpet/CarpetLib/src/gh.cc @@ -7,7 +7,7 @@ copyright : (C) 2000 by Erik Schnetter email : schnetter@astro.psu.edu - $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/gh.cc,v 1.12 2002/03/11 13:17:13 schnetter Exp $ + $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/gh.cc,v 1.13 2002/05/05 22:17:02 schnetter Exp $ ***************************************************************************/ @@ -28,9 +28,7 @@ #include "dh.hh" #include "th.hh" -#if !defined(TMPL_IMPLICIT) || !defined(GH_HH) -# include "gh.hh" -#endif +#include "gh.hh" using namespace std; @@ -249,8 +247,4 @@ ostream& gh<D>::output (ostream& os) const { -#if defined(TMPL_EXPLICIT) - template class gh<3>; - -#endif diff --git a/Carpet/CarpetLib/src/gh.hh b/Carpet/CarpetLib/src/gh.hh index a1f917f95..a9971fb2b 100644 --- a/Carpet/CarpetLib/src/gh.hh +++ b/Carpet/CarpetLib/src/gh.hh @@ -7,7 +7,7 @@ copyright : (C) 2000 by Erik Schnetter email : schnetter@astro.psu.edu - $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/gh.hh,v 1.9 2002/03/11 13:17:13 schnetter Exp $ + $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/gh.hh,v 1.10 2002/05/05 22:17:02 schnetter Exp $ ***************************************************************************/ @@ -146,8 +146,4 @@ public: -#if defined(TMPL_IMPLICIT) -# include "gh.cc" -#endif - #endif // GH_HH diff --git a/Carpet/CarpetLib/src/io.cc b/Carpet/CarpetLib/src/io.cc index 099fd0890..f72b9e7a6 100644 --- a/Carpet/CarpetLib/src/io.cc +++ b/Carpet/CarpetLib/src/io.cc @@ -5,7 +5,7 @@ copyright : (C) 2000 by Erik Schnetter email : schnetter@astro.psu.edu - $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/Attic/io.cc,v 1.1 2001/03/01 13:40:10 eschnett Exp $ + $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/Attic/io.cc,v 1.2 2002/05/05 22:17:02 schnetter Exp $ ***************************************************************************/ @@ -20,9 +20,7 @@ #include "io.hh" -#if !defined(TMPL_IMPLICIT) || !defined(GF_HH) -# include "io.hh" -#endif +#include "io.hh" template<class TT> IObase::DataType datatype(TT dummy) diff --git a/Carpet/CarpetLib/src/io.hh b/Carpet/CarpetLib/src/io.hh index 624f3fefe..97b8376a4 100644 --- a/Carpet/CarpetLib/src/io.hh +++ b/Carpet/CarpetLib/src/io.hh @@ -5,7 +5,7 @@ copyright : (C) 2000 by Erik Schnetter email : schnetter@astro.psu.edu - $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/Attic/io.hh,v 1.1 2001/03/01 13:40:10 eschnett Exp $ + $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/Attic/io.hh,v 1.2 2002/05/05 22:17:03 schnetter Exp $ ***************************************************************************/ @@ -54,8 +54,4 @@ class io { -#if defined(TMPL_IMPLICIT) -# include "io.cc" -#endif - #endif // IO_HH diff --git a/Carpet/CarpetLib/src/th.cc b/Carpet/CarpetLib/src/th.cc index 1e01d4787..7d22c8829 100644 --- a/Carpet/CarpetLib/src/th.cc +++ b/Carpet/CarpetLib/src/th.cc @@ -6,7 +6,7 @@ copyright : (C) 2000 by Erik Schnetter email : schnetter@astro.psu.edu - $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/th.cc,v 1.6 2001/12/09 16:43:11 schnetter Exp $ + $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/th.cc,v 1.7 2002/05/05 22:17:03 schnetter Exp $ ***************************************************************************/ @@ -26,9 +26,7 @@ #include "defs.hh" #include "dggh.hh" -#if !defined(TMPL_IMPLICIT) || !defined(TH_HH) -# include "th.hh" -#endif +#include "th.hh" using namespace std; @@ -90,8 +88,3 @@ void th::output (ostream& os) const { } os << "}"; } - - - -#if defined(TMPL_EXPLICIT) -#endif diff --git a/Carpet/CarpetLib/src/th.hh b/Carpet/CarpetLib/src/th.hh index 444b0d1f0..76c79642f 100644 --- a/Carpet/CarpetLib/src/th.hh +++ b/Carpet/CarpetLib/src/th.hh @@ -6,7 +6,7 @@ copyright : (C) 2000 by Erik Schnetter email : schnetter@astro.psu.edu - $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/th.hh,v 1.4 2001/06/12 14:57:00 schnetter Exp $ + $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/th.hh,v 1.5 2002/05/05 22:17:03 schnetter Exp $ ***************************************************************************/ @@ -109,8 +109,4 @@ inline ostream& operator<< (ostream& os, const th& t) { -#if defined(TMPL_IMPLICIT) -# include "th.cc" -#endif - #endif // TH_HH diff --git a/Carpet/CarpetLib/src/vect.cc b/Carpet/CarpetLib/src/vect.cc index 85a608ee9..9fea98e59 100644 --- a/Carpet/CarpetLib/src/vect.cc +++ b/Carpet/CarpetLib/src/vect.cc @@ -5,7 +5,7 @@ copyright : (C) 2000 by Erik Schnetter email : schnetter@astro.psu.edu - $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/vect.cc,v 1.7 2002/03/11 13:17:13 schnetter Exp $ + $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/vect.cc,v 1.8 2002/05/05 22:17:03 schnetter Exp $ ***************************************************************************/ @@ -24,9 +24,7 @@ #include "defs.hh" -#if !defined(TMPL_IMPLICIT) || !defined(VECT_HH) -# include "vect.hh" -#endif +#include "vect.hh" using namespace std; @@ -66,8 +64,6 @@ void vect<T,D>::output (ostream& os) const { -#if defined(TMPL_EXPLICIT) - // Note: We need all dimensions all the time. template class vect<int,1>; template class vect<int,2>; @@ -77,5 +73,3 @@ template void vect<double,3>::input (istream& is); template void vect<vect<bool,2>,3>::input (istream& is); template void vect<double,3>::output (ostream& os) const; template void vect<vect<bool,2>,3>::output (ostream& os) const; - -#endif diff --git a/Carpet/CarpetLib/src/vect.hh b/Carpet/CarpetLib/src/vect.hh index beee9608d..bbb3bdf2e 100644 --- a/Carpet/CarpetLib/src/vect.hh +++ b/Carpet/CarpetLib/src/vect.hh @@ -5,7 +5,7 @@ copyright : (C) 2000 by Erik Schnetter email : schnetter@astro.psu.edu - $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/vect.hh,v 1.9 2002/03/11 13:17:13 schnetter Exp $ + $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/vect.hh,v 1.10 2002/05/05 22:17:03 schnetter Exp $ ***************************************************************************/ @@ -620,8 +620,4 @@ inline ostream& operator<< (ostream& os, const vect<T,D>& a) { -#if defined(TMPL_IMPLICIT) -# include "vect.cc" -#endif - #endif // VECT_HH |