Anonymous namespace here can cause build warnings
Merge pull request #6883 from wmtan/FixBuildWarnings

Anonymous namespace here can cause build warnings