Update the layout
Update post: C++11 auto and C++11 decltype