1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
|
--- a/common/web/JsonTest.cpp
+++ b/common/web/JsonTest.cpp
@@ -560,7 +560,7 @@
#ifdef __FreeBSD__
OLA_ASSERT_EQ(reinterpret_cast<JsonValue*>(0),
#else
- OLA_ASSERT_EQ(reinterpret_cast<JsonValue*>(NULL),
+ OLA_ASSERT_EQ(static_cast<JsonValue*>(NULL),
#endif // __FreeBSD__
string1.LookupElement(invalid_pointer));
@@ -580,7 +580,7 @@
#ifdef __FreeBSD__
OLA_ASSERT_EQ(reinterpret_cast<JsonValue*>(0),
#else
- OLA_ASSERT_EQ(reinterpret_cast<JsonValue*>(NULL),
+ OLA_ASSERT_EQ(static_cast<JsonValue*>(NULL),
#endif // __FreeBSD__
object.LookupElement(invalid_pointer));
@@ -605,7 +605,7 @@
#ifdef __FreeBSD__
OLA_ASSERT_EQ(reinterpret_cast<JsonValue*>(0),
#else
- OLA_ASSERT_EQ(reinterpret_cast<JsonValue*>(NULL),
+ OLA_ASSERT_EQ(static_cast<JsonValue*>(NULL),
#endif // __FreeBSD__
array->LookupElement(invalid_pointer));
@@ -619,14 +619,14 @@
#ifdef __FreeBSD__
OLA_ASSERT_EQ(reinterpret_cast<JsonValue*>(0),
#else
- OLA_ASSERT_EQ(reinterpret_cast<JsonValue*>(NULL),
+ OLA_ASSERT_EQ(static_cast<JsonValue*>(NULL),
#endif // __FreeBSD__
array->LookupElement(one_past_last));
#ifdef __FreeBSD__
OLA_ASSERT_EQ(reinterpret_cast<JsonValue*>(0),
#else
- OLA_ASSERT_EQ(reinterpret_cast<JsonValue*>(NULL),
+ OLA_ASSERT_EQ(static_cast<JsonValue*>(NULL),
#endif // __FreeBSD__
array->LookupElement(invalid));
--- a/ola/AutoStart.cpp
+++ b/ola/AutoStart.cpp
@@ -113,7 +113,7 @@
#ifdef __FreeBSD__
reinterpret_cast<char*>(0));
#else
- reinterpret_cast<char*>(NULL));
+ static_cast<char*>(NULL));
#endif // __FreeBSD__
OLA_WARN << "Failed to exec: " << strerror(errno);
_exit(1);
--- a/olad/plugin_api/UniverseTest.cpp
+++ b/olad/plugin_api/UniverseTest.cpp
@@ -635,7 +635,7 @@
#ifdef __FreeBSD__
reinterpret_cast<const RDMResponse*>(0)));
#else
- reinterpret_cast<const RDMResponse*>(NULL)));
+ static_cast<const RDMResponse*>(NULL)));
#endif // __FreeBSD__
// ok, now try something that returns a response from the port
@@ -661,7 +661,7 @@
#ifdef __FreeBSD__
reinterpret_cast<const RDMResponse*>(0)));
#else
- reinterpret_cast<const RDMResponse*>(NULL)));
+ static_cast<const RDMResponse*>(NULL)));
#endif // __FreeBSD__
// now try a broadcast fan out
@@ -694,7 +694,7 @@
#ifdef __FreeBSD__
reinterpret_cast<const RDMResponse*>(0)));
#else
- reinterpret_cast<const RDMResponse*>(NULL)));
+ static_cast<const RDMResponse*>(NULL)));
#endif // __FreeBSD__
// now confirm that if one of the ports fails to send, we see this response
@@ -722,7 +722,7 @@
#ifdef __FreeBSD__
reinterpret_cast<const RDMResponse*>(0)));
#else
- reinterpret_cast<const RDMResponse*>(NULL)));
+ static_cast<const RDMResponse*>(NULL)));
#endif // __FreeBSD__
// DUB responses are slightly different
@@ -746,7 +746,7 @@
#ifdef __FreeBSD__
reinterpret_cast<const RDMResponse*>(0)));
#else
- reinterpret_cast<const RDMResponse*>(NULL)));
+ static_cast<const RDMResponse*>(NULL)));
#endif // __FreeBSD__
// now check that we still get a RDM_DUB_RESPONSE even if one port returns an
@@ -767,7 +767,7 @@
#ifdef __FreeBSD__
reinterpret_cast<const RDMResponse*>(0)));
#else
- reinterpret_cast<const RDMResponse*>(NULL)));
+ static_cast<const RDMResponse*>(NULL)));
#endif // __FreeBSD__
// and the same again but the second port returns
@@ -788,7 +788,7 @@
#ifdef __FreeBSD__
reinterpret_cast<const RDMResponse*>(0)));
#else
- reinterpret_cast<const RDMResponse*>(NULL)));
+ static_cast<const RDMResponse*>(NULL)));
#endif // __FreeBSD__
// now the first port returns a RDM_TIMEOUT
@@ -808,7 +808,7 @@
#ifdef __FreeBSD__
reinterpret_cast<const RDMResponse*>(0)));
#else
- reinterpret_cast<const RDMResponse*>(NULL)));
+ static_cast<const RDMResponse*>(NULL)));
#endif // __FreeBSD__
// finally if neither ports support the DUB, we should return that
@@ -828,7 +828,7 @@
#ifdef __FreeBSD__
reinterpret_cast<const RDMResponse*>(0)));
#else
- reinterpret_cast<const RDMResponse*>(NULL)));
+ static_cast<const RDMResponse*>(NULL)));
#endif // __FreeBSD__
universe->RemovePort(&port1);
--- a/plugins/spi/SPIOutputTest.cpp
+++ b/plugins/spi/SPIOutputTest.cpp
@@ -160,7 +160,7 @@
OLA_ASSERT_EQ(5u, backend.Writes(0));
// Check nothing changed on the other output.
- OLA_ASSERT_EQ(reinterpret_cast<const uint8_t*>(NULL),
+ OLA_ASSERT_EQ(static_cast<const uint8_t*>(NULL),
backend.GetData(1, &length));
OLA_ASSERT_EQ(0u, backend.Writes(1));
}
@@ -210,7 +210,7 @@
OLA_ASSERT_EQ(3u, backend.Writes(0));
// Check nothing changed on the other output.
- OLA_ASSERT_EQ(reinterpret_cast<const uint8_t*>(NULL),
+ OLA_ASSERT_EQ(static_cast<const uint8_t*>(NULL),
backend.GetData(1, &length));
OLA_ASSERT_EQ(0u, backend.Writes(1));
}
@@ -265,7 +265,7 @@
OLA_ASSERT_EQ(4u, backend.Writes(0));
// Check nothing changed on the other output.
- OLA_ASSERT_EQ(reinterpret_cast<const uint8_t*>(NULL),
+ OLA_ASSERT_EQ(static_cast<const uint8_t*>(NULL),
backend.GetData(1, &length));
OLA_ASSERT_EQ(0u, backend.Writes(1));
}
@@ -312,7 +312,7 @@
OLA_ASSERT_DATA_EQUALS(EXPECTED4, arraysize(EXPECTED4), data, length);
// Check nothing changed on the other output.
- OLA_ASSERT_EQ(reinterpret_cast<const uint8_t*>(NULL),
+ OLA_ASSERT_EQ(static_cast<const uint8_t*>(NULL),
backend.GetData(1, &length));
OLA_ASSERT_EQ(0u, backend.Writes(1));
}
@@ -371,7 +371,7 @@
OLA_ASSERT_EQ(4u, backend.Writes(0));
// Check nothing changed on the other output.
- OLA_ASSERT_EQ(reinterpret_cast<const uint8_t*>(NULL),
+ OLA_ASSERT_EQ(static_cast<const uint8_t*>(NULL),
backend.GetData(1, &length));
OLA_ASSERT_EQ(0u, backend.Writes(1));
}
@@ -421,7 +421,7 @@
OLA_ASSERT_DATA_EQUALS(EXPECTED4, arraysize(EXPECTED4), data, length);
// Check nothing changed on the other output.
- OLA_ASSERT_EQ(reinterpret_cast<const uint8_t*>(NULL),
+ OLA_ASSERT_EQ(static_cast<const uint8_t*>(NULL),
backend.GetData(1, &length));
OLA_ASSERT_EQ(0u, backend.Writes(1));
}
@@ -517,7 +517,7 @@
// test6
// Check nothing changed on the other output.
- OLA_ASSERT_EQ(reinterpret_cast<const uint8_t*>(NULL),
+ OLA_ASSERT_EQ(static_cast<const uint8_t*>(NULL),
backend.GetData(1, &length));
OLA_ASSERT_EQ(0u, backend.Writes(1));
@@ -707,7 +707,7 @@
// test6
// Check nothing changed on the other output.
- OLA_ASSERT_EQ(reinterpret_cast<const uint8_t*>(NULL),
+ OLA_ASSERT_EQ(static_cast<const uint8_t*>(NULL),
backend.GetData(1, &length));
OLA_ASSERT_EQ(0u, backend.Writes(1));
|
GitWeb