move to macros due to const/non-const
1 file changed