5e3e4ef Address compiler errors from GCC 7 (backported from git)

Authored and Committed by ellert 7 years ago
    Address compiler errors from GCC 7 (backported from git)
    
        
file added
+661
file modified
+643 -660
file modified
+9 -2