Skip to content

Commit a9aa637

Browse files
author
Daniel Marjamäki
committed
gcc: disabled -Wconversion again - too many warnings
1 parent 68700b3 commit a9aa637

File tree

7 files changed

+26
-25
lines changed

7 files changed

+26
-25
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# This file is generated by tools/dmake, do not edit.
22

33
ifndef CXXFLAGS
4-
CXXFLAGS=-Wall -Wextra -Wshadow -pedantic -Wno-long-long -Wfloat-equal -Wcast-qual -Wsign-conversion -Wconversion -g
4+
CXXFLAGS=-Wall -Wextra -Wshadow -pedantic -Wno-long-long -Wfloat-equal -Wcast-qual -Wsign-conversion -g
55
endif
66

77
ifndef CXX

‎test/testcmdlineparser.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ class TestCmdlineParser : public TestFixture
122122
Settings settings;
123123
CmdLineParser parser(&settings);
124124
ASSERT(parser.ParseFromArgs(2, argv));
125-
ASSERT_EQUALS(1, parser.GetPathNames().size());
125+
ASSERT_EQUALS(1, (int)parser.GetPathNames().size());
126126
ASSERT_EQUALS("file.cpp", parser.GetPathNames().at(0));
127127
}
128128

@@ -133,7 +133,7 @@ class TestCmdlineParser : public TestFixture
133133
Settings settings;
134134
CmdLineParser parser(&settings);
135135
ASSERT(parser.ParseFromArgs(2, argv));
136-
ASSERT_EQUALS(1, parser.GetPathNames().size());
136+
ASSERT_EQUALS(1, (int)parser.GetPathNames().size());
137137
ASSERT_EQUALS("src", parser.GetPathNames().at(0));
138138
}
139139

@@ -144,7 +144,7 @@ class TestCmdlineParser : public TestFixture
144144
Settings settings;
145145
CmdLineParser parser(&settings);
146146
ASSERT_EQUALS(false, parser.ParseFromArgs(2, argv));
147-
ASSERT_EQUALS(0, parser.GetPathNames().size());
147+
ASSERT_EQUALS(0, (int)parser.GetPathNames().size());
148148
}
149149

150150
void verboseshort()

‎test/testerrorlogger.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ class TestErrorLogger : public TestFixture
6363
std::list<ErrorLogger::ErrorMessage::FileLocation> locs;
6464
locs.push_back(loc);
6565
ErrorMessage msg(locs, Severity::error, "Programming error.", "errorId");
66-
ASSERT_EQUALS(1, msg._callStack.size());
66+
ASSERT_EQUALS(1, (int)msg._callStack.size());
6767
ASSERT_EQUALS("Programming error.", msg.shortMessage());
6868
ASSERT_EQUALS("Programming error.", msg.verboseMessage());
6969
ASSERT_EQUALS("[foo.cpp:5]: (error) Programming error.", msg.toString(false));
@@ -78,7 +78,7 @@ class TestErrorLogger : public TestFixture
7878
std::list<ErrorLogger::ErrorMessage::FileLocation> locs;
7979
locs.push_back(loc);
8080
ErrorMessage msg(locs, Severity::error, "Programming error.\nVerbose error", "errorId");
81-
ASSERT_EQUALS(1, msg._callStack.size());
81+
ASSERT_EQUALS(1, (int)msg._callStack.size());
8282
ASSERT_EQUALS("Programming error.", msg.shortMessage());
8383
ASSERT_EQUALS("Verbose error", msg.verboseMessage());
8484
ASSERT_EQUALS("[foo.cpp:5]: (error) Programming error.", msg.toString(false));
@@ -93,7 +93,7 @@ class TestErrorLogger : public TestFixture
9393
std::list<ErrorLogger::ErrorMessage::FileLocation> locs;
9494
locs.push_back(loc);
9595
ErrorMessage msg(locs, Severity::error, "Programming error.\nVerbose error", "errorId");
96-
ASSERT_EQUALS(1, msg._callStack.size());
96+
ASSERT_EQUALS(1, (int)msg._callStack.size());
9797
ASSERT_EQUALS("Programming error.", msg.shortMessage());
9898
ASSERT_EQUALS("Verbose error", msg.verboseMessage());
9999
ASSERT_EQUALS("foo.cpp:5,error,errorId,Programming error.", msg.toString(false, "{file}:{line},{severity},{id},{message}"));
@@ -108,7 +108,7 @@ class TestErrorLogger : public TestFixture
108108
std::list<ErrorLogger::ErrorMessage::FileLocation> locs;
109109
locs.push_back(loc);
110110
ErrorMessage msg(locs, Severity::error, "Programming error.\nVerbose error", "errorId");
111-
ASSERT_EQUALS(1, msg._callStack.size());
111+
ASSERT_EQUALS(1, (int)msg._callStack.size());
112112
ASSERT_EQUALS("Programming error.", msg.shortMessage());
113113
ASSERT_EQUALS("Verbose error", msg.verboseMessage());
114114
ASSERT_EQUALS("Programming error. - foo.cpp(5):(error,errorId)", msg.toString(false, "{message} - {file}({line}):({severity},{id})"));

‎test/testfilelister_unix.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class TestFileLister: public TestFixture
4242
ful.recursiveAddFiles2(relative, absolute, ".");
4343

4444
ASSERT(relative.size() != 0);
45-
ASSERT_EQUALS(relative.size(), absolute.size());
45+
ASSERT_EQUALS((int)relative.size(), (int)absolute.size());
4646

4747
for (std::vector<std::string>::const_iterator r = relative.begin(), r_end = relative.end(),
4848
a = absolute.begin(), a_end = absolute.end();

‎test/testpreprocessor.cpp‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1070,7 +1070,7 @@ class TestPreprocessor : public TestFixture
10701070
preprocessor.preprocess(istr, actual, "file.c");
10711071

10721072
// Compare results..
1073-
ASSERT_EQUALS(1, actual.size());
1073+
ASSERT_EQUALS(1, (int)actual.size());
10741074
ASSERT_EQUALS("\n\na1;\n\n", actual[""]);
10751075
}
10761076

@@ -1088,7 +1088,7 @@ class TestPreprocessor : public TestFixture
10881088
preprocessor.preprocess(istr, actual, "file.c");
10891089

10901090
// Compare results..
1091-
ASSERT_EQUALS(1, actual.size());
1091+
ASSERT_EQUALS(1, (int)actual.size());
10921092
ASSERT_EQUALS("\n\n", actual[""]);
10931093
}
10941094

@@ -1107,7 +1107,7 @@ class TestPreprocessor : public TestFixture
11071107
preprocessor.preprocess(istr, actual, "file.c");
11081108

11091109
// Compare results..
1110-
ASSERT_EQUALS(1, actual.size());
1110+
ASSERT_EQUALS(1, (int)actual.size());
11111111
ASSERT_EQUALS("\nabc\n\n", actual[""]);
11121112
}
11131113

@@ -1163,7 +1163,7 @@ class TestPreprocessor : public TestFixture
11631163
preprocessor.preprocess(istr, actual, "file.c");
11641164

11651165
// Compare results..
1166-
ASSERT_EQUALS(1, actual.size());
1166+
ASSERT_EQUALS(1, (int)actual.size());
11671167
ASSERT_EQUALS("\n\n\n", actual[""]);
11681168

11691169
// the "defined(DEF_10) || defined(DEF_11)" are not handled correctly..
@@ -2229,7 +2229,7 @@ class TestPreprocessor : public TestFixture
22292229

22302230
// Compare results..
22312231
ASSERT_EQUALS("\n\n\n\nB\n\n", actual[""]);
2232-
ASSERT_EQUALS(1, actual.size());
2232+
ASSERT_EQUALS(1, (int)actual.size());
22332233
}
22342234

22352235
{
@@ -2247,7 +2247,7 @@ class TestPreprocessor : public TestFixture
22472247

22482248
// Compare results..
22492249
ASSERT_EQUALS("\n\n1\n\n", actual[""]);
2250-
ASSERT_EQUALS(1, actual.size());
2250+
ASSERT_EQUALS(1, (int)actual.size());
22512251
}
22522252

22532253
{
@@ -2265,7 +2265,7 @@ class TestPreprocessor : public TestFixture
22652265

22662266
// Compare results..
22672267
ASSERT_EQUALS("\n\n1\n\n", actual[""]);
2268-
ASSERT_EQUALS(1, actual.size());
2268+
ASSERT_EQUALS(1, (int)actual.size());
22692269
}
22702270

22712271
{
@@ -2283,7 +2283,7 @@ class TestPreprocessor : public TestFixture
22832283

22842284
// Compare results..
22852285
ASSERT_EQUALS("\n\n1\n\n", actual[""]);
2286-
ASSERT_EQUALS(1, actual.size());
2286+
ASSERT_EQUALS(1, (int)actual.size());
22872287
}
22882288
}
22892289

@@ -2304,7 +2304,7 @@ class TestPreprocessor : public TestFixture
23042304
// Compare results..
23052305
ASSERT_EQUALS("\n\n\n\n", actual[""]);
23062306
TODO_ASSERT_EQUALS(1, actual.size());
2307-
ASSERT_EQUALS(2, actual.size());
2307+
ASSERT_EQUALS(2, (int)actual.size());
23082308
}
23092309

23102310
void define_ifndef2()
@@ -2347,7 +2347,7 @@ class TestPreprocessor : public TestFixture
23472347
preprocessor.preprocess(istr, actual, "file.c");
23482348

23492349
// Compare results..
2350-
ASSERT_EQUALS(4U, actual.size());
2350+
ASSERT_EQUALS(4, (int)actual.size());
23512351
ASSERT(actual.find("") != actual.end());
23522352
ASSERT(actual.find("BAR") != actual.end());
23532353
ASSERT(actual.find("FOO") != actual.end());
@@ -2370,7 +2370,7 @@ class TestPreprocessor : public TestFixture
23702370

23712371
// Compare results..
23722372
ASSERT_EQUALS("char a[] = \"#endfile\";\nchar b[] = \"#endfile\";\n\n", actual[""]);
2373-
ASSERT_EQUALS(1, actual.size());
2373+
ASSERT_EQUALS(1, (int)actual.size());
23742374
}
23752375
};
23762376

‎test/testtoken.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,16 +96,16 @@ class TestToken : public TestFixture
9696
Token tok(0);
9797

9898
tok.str("\"\"");
99-
ASSERT_EQUALS(0, Token::getStrLength(&tok));
99+
ASSERT_EQUALS(0, (int)Token::getStrLength(&tok));
100100

101101
tok.str("\"test\"");
102-
ASSERT_EQUALS(4, Token::getStrLength(&tok));
102+
ASSERT_EQUALS(4, (int)Token::getStrLength(&tok));
103103

104104
tok.str("\"test \\\\test\"");
105-
ASSERT_EQUALS(10, Token::getStrLength(&tok));
105+
ASSERT_EQUALS(10, (int)Token::getStrLength(&tok));
106106

107107
tok.str("\"a\\0\"");
108-
ASSERT_EQUALS(1, Token::getStrLength(&tok));
108+
ASSERT_EQUALS(1, (int)Token::getStrLength(&tok));
109109
}
110110

111111
void strValue()

‎tools/dmake.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,7 @@ int main(int argc, char **argv)
184184
{
185185
// TODO: add more compiler warnings.
186186
// -Wlogical-op : doesn't work on older GCC
187+
// -Wconversion : too many warnings
187188

188189
// The _GLIBCXX_DEBUG doesn't work in cygwin
189190
makeConditionalVariable(fout, "CXXFLAGS",
@@ -195,7 +196,7 @@ int main(int argc, char **argv)
195196
"-Wfloat-equal "
196197
"-Wcast-qual "
197198
"-Wsign-conversion "
198-
"-Wconversion "
199+
// "-Wconversion "
199200
"-g");
200201
}
201202
makeConditionalVariable(fout, "CXX", "g++");

0 commit comments

Comments
 (0)