diff options
| author | eschnett <eschnett@105869f7-3296-0410-a4ea-f4349344b45a> | 2012-10-22 19:26:21 +0000 |
|---|---|---|
| committer | eschnett <eschnett@105869f7-3296-0410-a4ea-f4349344b45a> | 2012-10-22 19:26:21 +0000 |
| commit | 37d3dda7f2497004dd295089aa9bb11ce287d1b3 (patch) | |
| tree | b6f9ac98d5d092823f8cd790d94c570b6f9c8812 | |
| parent | 0afc7062a13dcbb1cd88b5f0a6aad112b92bc103 (diff) | |
Add std:: prefix
git-svn-id: https://svn.cct.lsu.edu/repos/numrel/LSUThorns/Vectors/trunk@68 105869f7-3296-0410-a4ea-f4349344b45a
| -rw-r--r-- | src/vectors-4-default.h | 9 | ||||
| -rw-r--r-- | src/vectors-8-default.h | 9 |
2 files changed, 4 insertions, 14 deletions
diff --git a/src/vectors-4-default.h b/src/vectors-4-default.h index 9b2f7f6..2ef4856 100644 --- a/src/vectors-4-default.h +++ b/src/vectors-4-default.h @@ -111,14 +111,9 @@ ({ \ CCTK_REAL x__=(x_); \ CCTK_REAL x=x__; \ - x==(CCTK_REAL)0.0 ? (CCTK_REAL)0.0 : copysign((CCTK_REAL)1.0, x); \ + x==(CCTK_REAL)0.0 ? (CCTK_REAL)0.0 : std::copysign((CCTK_REAL)1.0, x); \ }) - -#ifdef __cplusplus -# define k4signbit(x) ({ using namespace std; signbit(x); }) -#else -# define k4signbit(x) (signbit(x)) -#endif +#define k4signbit(x) (std::signbit(x)) #define k4l2r(x_) ({ CCTK_INT4 x__=(x_); CCTK_INT4 x=x__; *(CCTK_REAL4*)&x; }) #define k4r2l(x_) ({ CCTK_REAL4 x__=(x_); CCTK_REAL4 x=x__; *(CCTK_INT4*)&x; }) diff --git a/src/vectors-8-default.h b/src/vectors-8-default.h index d55e29e..dcdde8b 100644 --- a/src/vectors-8-default.h +++ b/src/vectors-8-default.h @@ -109,14 +109,9 @@ ({ \ CCTK_REAL x__=(x_); \ CCTK_REAL x=x__; \ - x==(CCTK_REAL)0.0 ? (CCTK_REAL)0.0 : copysign((CCTK_REAL)1.0, x); \ + x==(CCTK_REAL)0.0 ? (CCTK_REAL)0.0 : std::copysign((CCTK_REAL)1.0, x); \ }) - -#ifdef __cplusplus -# define k8signbit(x) ({ using namespace std; signbit(x); }) -#else -# define k8signbit(x) (signbit(x)) -#endif +#define k8signbit(x) (std::signbit(x)) #define k8l2r(x_) ({ CCTK_INT8 x__=(x_); CCTK_INT8 x=x__; *(CCTK_REAL8*)&x; }) #define k8r2l(x_) ({ CCTK_REAL8 x__=(x_); CCTK_REAL8 x=x__; *(CCTK_INT8*)&x; }) |