fix g++ warnings and always_inline usage#10

joshua-henderson wants to merge 3 commits intorandrew:masterrandrew/layout:masterfrom

joshua-henderson:upstreamjoshua-henderson/layout:upstreamCopy head branch name to clipboard