diff options
| author | jthorn <jthorn@f88db872-0e4f-0410-b76b-b9085cfa78c5> | 2005-02-01 14:58:53 +0000 |
|---|---|---|
| committer | jthorn <jthorn@f88db872-0e4f-0410-b76b-b9085cfa78c5> | 2005-02-01 14:58:53 +0000 |
| commit | cb95431b072f5519a083a59e878255c5bcab64d1 (patch) | |
| tree | d36d7e7ee32fc44b5d288f244ae16ad086071fb5 /src/gr | |
| parent | 0026d529a6a0ccd030d9510858726bcd3e1e0d24 (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/gr')
| -rw-r--r-- | src/gr/Schwarzschild_EF.cc | 2 | ||||
| -rw-r--r-- | src/gr/expansion.cc | 6 | ||||
| -rw-r--r-- | src/gr/expansion_Jacobian.cc | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/gr/Schwarzschild_EF.cc b/src/gr/Schwarzschild_EF.cc index 4a63bb5..b27d5a4 100644 --- a/src/gr/Schwarzschild_EF.cc +++ b/src/gr/Schwarzschild_EF.cc @@ -23,7 +23,6 @@ #include "../jtutil/array.hh" #include "../jtutil/cpm_map.hh" #include "../jtutil/linear_map.hh" -using jtutil::error_exit; #include "../patch/coords.hh" #include "../patch/grid.hh" @@ -42,6 +41,7 @@ using jtutil::error_exit; // all the code in this file is inside this namespace namespace AHFinderDirect { +using jtutil::error_exit; //****************************************************************************** diff --git a/src/gr/expansion.cc b/src/gr/expansion.cc index 4d7ae34..5a03783 100644 --- a/src/gr/expansion.cc +++ b/src/gr/expansion.cc @@ -47,9 +47,6 @@ #include "../jtutil/array.hh" #include "../jtutil/cpm_map.hh" #include "../jtutil/linear_map.hh" -using jtutil::error_exit; -using jtutil::pow2; -using jtutil::pow4; #include "../patch/coords.hh" #include "../patch/grid.hh" @@ -68,6 +65,9 @@ using jtutil::pow4; // all the code in this file is inside this namespace namespace AHFinderDirect { +using jtutil::error_exit; +using jtutil::pow2; +using jtutil::pow4; //****************************************************************************** //****************************************************************************** diff --git a/src/gr/expansion_Jacobian.cc b/src/gr/expansion_Jacobian.cc index 8c4e9e2..372d114 100644 --- a/src/gr/expansion_Jacobian.cc +++ b/src/gr/expansion_Jacobian.cc @@ -24,7 +24,6 @@ #include "../jtutil/array.hh" #include "../jtutil/cpm_map.hh" #include "../jtutil/linear_map.hh" -using jtutil::error_exit; #include "../patch/coords.hh" #include "../patch/grid.hh" @@ -43,6 +42,7 @@ using jtutil::error_exit; // all the code in this file is inside this namespace namespace AHFinderDirect { +using jtutil::error_exit; //****************************************************************************** |