aboutsummaryrefslogtreecommitdiff
path: root/src/jtutil/array.hh
diff options
context:
space:
mode:
authorjthorn <jthorn@f88db872-0e4f-0410-b76b-b9085cfa78c5>2005-02-01 14:58:53 +0000
committerjthorn <jthorn@f88db872-0e4f-0410-b76b-b9085cfa78c5>2005-02-01 14:58:53 +0000
commitcb95431b072f5519a083a59e878255c5bcab64d1 (patch)
treed36d7e7ee32fc44b5d288f244ae16ad086071fb5 /src/jtutil/array.hh
parent0026d529a6a0ccd030d9510858726bcd3e1e0d24 (diff)
fix a C++ namespaces bug found by Erik:
error_exit() was declared extern "C" --> it wasn't namespace-mangled --> it could conflict with a similar error_exit() in another thorn although this fix touches a *lot* of files, it's conceptually simple: * error_exit() is not extern "C" any more * everything in src/jtutil/ (which used to be in the jtutil:: namespace) is now in the AHFinderDirect::jtutil:: namespace --> all C++ code in this thorn is now inside the AHFinderDirect:: namespace git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinAnalysis/AHFinderDirect/trunk@1395 f88db872-0e4f-0410-b76b-b9085cfa78c5
Diffstat (limited to 'src/jtutil/array.hh')
-rw-r--r--src/jtutil/array.hh21
1 files changed, 9 insertions, 12 deletions
diff --git a/src/jtutil/array.hh b/src/jtutil/array.hh
index bf70628..96bb87a 100644
--- a/src/jtutil/array.hh
+++ b/src/jtutil/array.hh
@@ -62,10 +62,14 @@
//
#endif
-//******************************************************************************
-
+// everything in this file is inside these namespaces
+namespace AHFinderDirect
+ {
namespace jtutil
{
+
+//******************************************************************************
+
template <typename T>
class array1d
{
@@ -146,12 +150,9 @@ private:
bool we_own_array_; // true ==> array_ --> new[] array which we own
// false ==> array_ --> client-owned storage
};
- } // namespace jtutil::
//******************************************************************************
-namespace jtutil
- {
template <typename T>
class array2d
{
@@ -243,12 +244,9 @@ private:
bool we_own_array_; // true ==> array_ --> new[] array which we own
// false ==> array_ --> client-owned storage
};
- } // namespace jtutil::
//******************************************************************************
-namespace jtutil
- {
template <typename T>
class array3d
{
@@ -348,13 +346,10 @@ private:
bool we_own_array_; // true ==> array_ --> new[] array which we own
// false ==> array_ --> client-owned storage
};
- } // namespace jtutil::
//******************************************************************************
#ifdef NOT_USED
-namespace jtutil
- {
template <typename T>
class array4d
{
@@ -469,9 +464,11 @@ private:
bool we_own_array_; // true ==> array_ --> new[] array which we own
// false ==> array_ --> client-owned storage
};
- } // namespace jtutil::
#endif /* NOT_USED */
//******************************************************************************
+ }; // namespace jtutil
+ }; // namespace AHFinderDirect
+
#endif /* AHFINDERDIRECT__ARRAY_HH */