diff options
Diffstat (limited to 'src/include/FortranString.h')
| -rw-r--r-- | src/include/FortranString.h | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/src/include/FortranString.h b/src/include/FortranString.h index 6d413e4e..d2bcd9d6 100644 --- a/src/include/FortranString.h +++ b/src/include/FortranString.h @@ -28,19 +28,19 @@ _fcd fcd_arg1, _fcd fcd_arg2, _fcd fcd_arg3 #define ONE_FORTSTRING_CREATE(argn)\ int len = _fcdlen(fcdarg); \ - char *argn = CCTK_NullTerminateString(_fcdtocp(fcdarg),len);; + char *argn = Util_NullTerminateString(_fcdtocp(fcdarg),len);; #define TWO_FORTSTRINGS_CREATE(argn,argw)\ int nl = _fcdlen(fcd_n);\ int wl = _fcdlen(fcd_w);\ - char *argn = CCTK_NullTerminateString(_fcdtocp(fcd_n),nl);\ - char *argw = CCTK_NullTerminateString(_fcdtocp(fcd_w),wl); + char *argn = Util_NullTerminateString(_fcdtocp(fcd_n),nl);\ + char *argw = Util_NullTerminateString(_fcdtocp(fcd_w),wl); #define THREE_FORTSTRINGS_CREATE(arg1,arg2,arg3)\ int narg1 = _fcdlen(fcd_arg1);\ int narg2 = _fcdlen(fcd_arg2);\ int narg3 = _fcdlen(fcd_arg3);\ - char *arg1 = CCTK_NullTerminateString(_fcdtocp(fcd_arg1),narg1);\ - char *arg2 = CCTK_NullTerminateString(_fcdtocp(fcd_arg2),narg2);\ - char *arg3 = CCTK_NullTerminateString(_fcdtocp(fcd_arg3),narg3); + char *arg1 = Util_NullTerminateString(_fcdtocp(fcd_arg1),narg1);\ + char *arg2 = Util_NullTerminateString(_fcdtocp(fcd_arg2),narg2);\ + char *arg3 = Util_NullTerminateString(_fcdtocp(fcd_arg3),narg3); #elif defined WIN32 @@ -56,14 +56,14 @@ unsigned int CCTK_len2,\ unsigned int CCTK_len3 #define ONE_FORTSTRING_CREATE(argn)\ - char *argn = CCTK_NullTerminateString(n,nl); + char *argn = Util_NullTerminateString(n,nl); #define TWO_FORTSTRINGS_CREATE(argn,argw)\ - char *argn = CCTK_NullTerminateString(n,nl);\ - char *argw = CCTK_NullTerminateString(w,wl); + char *argn = Util_NullTerminateString(n,nl);\ + char *argw = Util_NullTerminateString(w,wl); #define THREE_FORTSTRINGS_CREATE(arg1,arg2,arg3)\ - char *arg1 = CCTK_NullTerminateString(CCTK_str1,CCTK_len1);\ - char *arg2 = CCTK_NullTerminateString(CCTK_str2,CCTK_len2);\ - char *arg3 = CCTK_NullTerminateString(CCTK_str3,CCTK_len3); + char *arg1 = Util_NullTerminateString(CCTK_str1,CCTK_len1);\ + char *arg2 = Util_NullTerminateString(CCTK_str2,CCTK_len2);\ + char *arg3 = Util_NullTerminateString(CCTK_str3,CCTK_len3); #else @@ -83,14 +83,14 @@ unsigned int CCTK_len2,\ unsigned int CCTK_len3 #define ONE_FORTSTRING_CREATE(arg1)\ - char *arg1 = CCTK_NullTerminateString(CCTK_str1,CCTK_len1); + char *arg1 = Util_NullTerminateString(CCTK_str1,CCTK_len1); #define TWO_FORTSTRINGS_CREATE(arg1,arg2)\ - char *arg1 = CCTK_NullTerminateString(CCTK_str1,CCTK_len1);\ - char *arg2 = CCTK_NullTerminateString(CCTK_str2,CCTK_len2); + char *arg1 = Util_NullTerminateString(CCTK_str1,CCTK_len1);\ + char *arg2 = Util_NullTerminateString(CCTK_str2,CCTK_len2); #define THREE_FORTSTRINGS_CREATE(arg1,arg2,arg3)\ - char *arg1 = CCTK_NullTerminateString(CCTK_str1,CCTK_len1);\ - char *arg2 = CCTK_NullTerminateString(CCTK_str2,CCTK_len2);\ - char *arg3 = CCTK_NullTerminateString(CCTK_str3,CCTK_len3); + char *arg1 = Util_NullTerminateString(CCTK_str1,CCTK_len1);\ + char *arg2 = Util_NullTerminateString(CCTK_str2,CCTK_len2);\ + char *arg3 = Util_NullTerminateString(CCTK_str3,CCTK_len3); #endif |