K 10 svn:author V 6 sbruno K 8 svn:date V 27 2016-06-02T18:37:34.067276Z K 7 svn:log V 96 Fixup for macros that conflict with standard C++ function names. PR: 209590 Submitted by: dim@ END