Removed unused variable which caused Linux build to fail
Fixed compilation error for iOS project using Compiler Default C++ Language Dialect
Merge branch 'ccdata-in-userdefault' into coolki