From 0b05f14aa0d2d7fd6ec45c78a10a2ac58cff734b Mon Sep 17 00:00:00 2001 From: rhaas Date: Thu, 3 Dec 2009 17:58:28 +0000 Subject: 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 --- src/slab.cc | 3 --- src/slab.h | 5 +---- 2 files changed, 1 insertion(+), 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 */ -- cgit v1.2.3