aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrhaas <rhaas@2e825fa2-fb71-486d-8b7f-a5ff3f0f6cb8>2009-12-03 17:58:28 +0000
committerrhaas <rhaas@2e825fa2-fb71-486d-8b7f-a5ff3f0f6cb8>2009-12-03 17:58:28 +0000
commit0b05f14aa0d2d7fd6ec45c78a10a2ac58cff734b (patch)
treeebfb8a4ab3040f2e36dd6d3cf3f1344a3df246df
parentae40b2b351ea71ccbe203f71f596cc993dd60c56 (diff)
revert last commit since it actually breaks C++ calls
git-svn-id: http://svn.cactuscode.org/arrangements/CactusNumerical/Slab/trunk@70 2e825fa2-fb71-486d-8b7f-a5ff3f0f6cb8
-rw-r--r--src/slab.cc3
-rw-r--r--src/slab.h5
2 files changed, 1 insertions, 7 deletions
diff --git a/src/slab.cc b/src/slab.cc
index 881278c..17ddb0c 100644
--- a/src/slab.cc
+++ b/src/slab.cc
@@ -54,8 +54,6 @@
using namespace std;
-namespace Slab
-{
#ifdef DEBUG
# define ifdebug
@@ -1779,4 +1777,3 @@ Slab_Transfer (cGH const * restrict const cctkGH,
return Slab_MultiTransfer (cctkGH, dim, xferinfo, options,
nvars, srctypes, srcptrs, dsttypes, dstptrs);
}
-}
diff --git a/src/slab.h b/src/slab.h
index 97e10ab..7c02cce 100644
--- a/src/slab.h
+++ b/src/slab.h
@@ -4,8 +4,6 @@
#define SLAB_H
#ifdef __cplusplus
-namespace Slab
-{
extern "C"
{
#endif
@@ -124,8 +122,7 @@ Slab_MultiTransfer (cGH const * CCTK_RESTRICT
void * CCTK_RESTRICT const * CCTK_RESTRICT const dstptrs);
#ifdef __cplusplus
-} /* extern "C" */
-} /* namespace Slab */
+}
#endif
#endif /* defined SLAB_H */