Added an option for supporting deprecated C++ constructs