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/bboxset.hh | |
| 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/bboxset.hh')
| -rw-r--r-- | Carpet/CarpetLib/src/bboxset.hh | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/Carpet/CarpetLib/src/bboxset.hh b/Carpet/CarpetLib/src/bboxset.hh index dae3d3f3f..4883cc6e9 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.3 2001/03/12 16:54:25 eschnett Exp $ + $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/bboxset.hh,v 1.4 2001/03/22 18:42:05 eschnett Exp $ ***************************************************************************/ @@ -21,7 +21,8 @@ #ifndef BBOXSET_HH #define BBOXSET_HH -#include <cassert> +#include <assert.h> + #include <iostream> #include <set> @@ -29,6 +30,8 @@ #include "defs.hh" #include "vect.hh" +using namespace std; + // Forward definition @@ -105,8 +108,8 @@ public: // friend bboxset operator- <T,D>(const box& b, const bboxset& s); // Iterators - typedef bset::const_iterator const_iterator; - typedef bset::iterator iterator; + typedef typename bset::const_iterator const_iterator; + typedef typename bset::iterator iterator; iterator begin () const { return bs.begin(); } iterator end () const { return bs.end(); } |