Callfunction cplusplus 11

Resolve conflict for #2688