[thrift] shuffle method definitions to make clang happy, see #320