issue #1686:fix some compiling error
Merge pull request #2065 from minggo/iss1686-synchronize

issue #1686:fix some compiling error