fix Issue 10117 - Support C++ class-scope static variables