aboutsummaryrefslogtreecommitdiff
path: root/src/elliptic
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/elliptic
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/elliptic')
-rw-r--r--src/elliptic/Jacobian.cc2
-rw-r--r--src/elliptic/dense_Jacobian.cc2
-rw-r--r--src/elliptic/row_sparse_Jacobian.cc2
3 files changed, 3 insertions, 3 deletions
diff --git a/src/elliptic/Jacobian.cc b/src/elliptic/Jacobian.cc
index 0f9d427..8a1cfa4 100644
--- a/src/elliptic/Jacobian.cc
+++ b/src/elliptic/Jacobian.cc
@@ -22,7 +22,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"
@@ -40,6 +39,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/elliptic/dense_Jacobian.cc b/src/elliptic/dense_Jacobian.cc
index d78b484..61e3a8e 100644
--- a/src/elliptic/dense_Jacobian.cc
+++ b/src/elliptic/dense_Jacobian.cc
@@ -30,7 +30,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"
@@ -47,6 +46,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/elliptic/row_sparse_Jacobian.cc b/src/elliptic/row_sparse_Jacobian.cc
index 4a198a6..6b1152f 100644
--- a/src/elliptic/row_sparse_Jacobian.cc
+++ b/src/elliptic/row_sparse_Jacobian.cc
@@ -86,7 +86,6 @@ extern "C"
#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"
@@ -103,6 +102,7 @@ using jtutil::error_exit;
// all the code in this file is inside this namespace
namespace AHFinderDirect
{
+using jtutil::error_exit;
//******************************************************************************
//******************************************************************************