Fix warnings

(cherry picked from commit 6274401919)

# Conflicts:
#	fmt/printf.h
#	test/string-test.cc
This commit is contained in:
Victor Zverovich
2016-11-06 12:29:59 -08:00
committed by Jonathan Müller
parent 5c69ecdd5e
commit 4a24a38861

View File

@ -1225,7 +1225,7 @@ TEST(FormatterTest, FormatOct) {
TEST(FormatterTest, FormatIntLocale) {
ScopedMock<LocaleMock> mock;
lconv lc = {};
lconv lc = lconv();
char sep[] = "--";
lc.thousands_sep = sep;
EXPECT_CALL(mock, localeconv()).Times(3).WillRepeatedly(testing::Return(&lc));