Merged
[CherryPick] adaptor high version gcc g++ #1163
Yuanhao JiAdd on Mar 21
[CherryPick] adaptor high version gcc g++ #1163
Merged
Yuanhao JiAdd on Mar 21