Automatically add needed cpp11 namespace directive (#1921)

Automatically add needed cpp11 namespace directive (#1921) #1821