diff options
| author | eschnett <eschnett@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2012-06-17 21:48:47 +0000 |
|---|---|---|
| committer | eschnett <eschnett@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2012-06-17 21:48:47 +0000 |
| commit | 07daec8e77fd0e55101bf42800c09a2b7a221e5f (patch) | |
| tree | a47161b9c8c488fba22da5e135284bd13ff9ad5e /lib/sbin | |
| parent | e00ef7f19b44767da74eb866b2b8ecaf3371dacd (diff) | |
Replace CCTK_RESTRICT by restrict, which is now defined by the flesh
git-svn-id: http://svn.cactuscode.org/flesh/trunk@4836 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib/sbin')
| -rw-r--r-- | lib/sbin/GridFuncStuff.pl | 25 |
1 files changed, 1 insertions, 24 deletions
diff --git a/lib/sbin/GridFuncStuff.pl b/lib/sbin/GridFuncStuff.pl index 20081246..c587e7e6 100644 --- a/lib/sbin/GridFuncStuff.pl +++ b/lib/sbin/GridFuncStuff.pl @@ -59,29 +59,6 @@ sub CreateVariableBindings push(@data, ''); push(@data, '#ifdef CCODE'); - # Deprecated in 4.0 beta 17 - push(@data, '/* Older configurations do not define CCTK_RESTRICT.'); - push(@data, ' * Remove this section after 4.0 beta 16 has been released'); - push(@data, ' */'); - - push(@data, '#ifndef CCTK_RESTRICT'); - push(@data, '#ifdef __cplusplus'); - push(@data, '#ifdef CCTK_CXX_RESTRICT'); - push(@data, '#define CCTK_RESTRICT CCTK_CXX_RESTRICT'); - push(@data, '#else'); - push(@data, '#define CCTK_RESTRICT'); - push(@data, '#endif'); - push(@data, '#else'); - push(@data, '#ifdef CCTK_C_RESTRICT'); - push(@data, '#define CCTK_RESTRICT CCTK_C_RESTRICT'); - push(@data, '#else'); - push(@data, '#define CCTK_RESTRICT'); - push(@data, '#endif'); - push(@data, '#endif'); - push(@data, '#endif'); - - # End deprecated section - push(@data, '/* prototype for CCTKi_VarDataPtr() goes here'); push(@data, ' because we don\'t want to include another CCTK header file */'); push(@data, '#include "cGH.h"'); @@ -522,7 +499,7 @@ sub CreateCArgumentDeclarations for(my $level = 0; $level < $ntimelevels; $level++) { - push(@declarations, "CCTK_DECLARE_INIT (CCTK_$type * CCTK_RESTRICT const, $varname, (CCTK_$type *) CCTKi_VarDataPtr(cctkGH, $level, $implementation, $var));"); + push(@declarations, "CCTK_DECLARE_INIT (CCTK_$type * restrict const, $varname, (CCTK_$type *) CCTKi_VarDataPtr(cctkGH, $level, $implementation, $var));"); # Modify the name for the time level $varname .= '_p'; |