This PR https://github.com/PaddlePaddle/Paddle/pull/4144 merged, but it does not merge changes in this PR https://github.com/PaddlePaddle/Paddle/pull/3946. It makes compiling the latest dev branch fail. I am fixing it.
