Merge "Fix warning from clang (class -> struct)."