merge cpp_0x and cpp_14
merge