165207b backport to fix FTBFs with GCC 7

Authored and Committed by than 7 years ago
    backport to fix FTBFs with GCC 7
    
        
file modified
+7 -1