2563046 Replaced the gcc 4.8 workaround with a more proper fix

Authored and Committed by epienbro 11 years ago
    Replaced the gcc 4.8 workaround with a more proper fix
    
        
file added
+44
file modified
+9 -4