diff options
author | eschnett <> | 2001-03-22 17:42:00 +0000 |
---|---|---|
committer | eschnett <> | 2001-03-22 17:42:00 +0000 |
commit | 68f39ddf2186d84194d7b5f8446b4b2f003a6c11 (patch) | |
tree | 5a6ec27e40ef1d942f12ee7ba59fa1f3f3a00913 /Carpet/CarpetLib/src/gf.cc | |
parent | a34f1f5e75afa08c73d09d2d8f614020fac8e951 (diff) |
Brought in latest differences from the SGI version. This is work
Brought in latest differences from the SGI version. This is work
towards a code that compiles on both architectures.
darcs-hash:20010322174200-f6438-23ab5f26cf84d2666312791c6bdb5a0fc1d0390a.gz
Diffstat (limited to 'Carpet/CarpetLib/src/gf.cc')
-rw-r--r-- | Carpet/CarpetLib/src/gf.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Carpet/CarpetLib/src/gf.cc b/Carpet/CarpetLib/src/gf.cc index 86a2d518d..6847d8506 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.2 2001/03/19 21:30:19 eschnett Exp $ + $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/gf.cc,v 1.3 2001/03/22 18:42:05 eschnett Exp $ ***************************************************************************/ @@ -19,7 +19,7 @@ * * ***************************************************************************/ -#include <cassert> +#include <assert.h> #include "defs.hh" @@ -27,6 +27,8 @@ # include "gf.hh" #endif +using namespace std; + // Constructors @@ -81,6 +83,7 @@ ostream& gf<T,D>::out (ostream& os) const { template class gf<T,3>; #include "instantiate" + #undef INSTANTIATE #endif |