Fix compile for clang 3.6 which has uniform init problems.

Fix compile for clang 3.6 which has uniform init problems. #156