[Bug 20432] Adapt WRC to recent GCC changes