fix Issue 10117 - Support C++ class-scope static variables
Merge pull request #2053 from IgorStepanov/cppstaticvar

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