Fixes #4850: Move r28034 to 1.8

---svn-pre-commit-ignore-below---

r28034 [[BR]]
Fix issue where the static inline part of the declaration would be improperly
set when using C++