Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit 35704c9

Browse files
committed
[[ BrowserWidget ]] Fix no return value in MCBrowserValueSetList. Replace "double_t" (not defined on windows) with "double"
1 parent 8aa0446 commit 35704c9

File tree

2 files changed

+14
-12
lines changed

2 files changed

+14
-12
lines changed

libbrowser/include/libbrowser.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -167,19 +167,19 @@ MC_DLLEXPORT bool MCBrowserListGetType(MCBrowserListRef p_list, uint32_t p_index
167167

168168
MC_DLLEXPORT bool MCBrowserListSetBoolean(MCBrowserListRef p_list, uint32_t p_index, bool p_value);
169169
MC_DLLEXPORT bool MCBrowserListSetInteger(MCBrowserListRef p_list, uint32_t p_index, int32_t p_value);
170-
MC_DLLEXPORT bool MCBrowserListSetDouble(MCBrowserListRef p_list, uint32_t p_index, double_t p_value);
170+
MC_DLLEXPORT bool MCBrowserListSetDouble(MCBrowserListRef p_list, uint32_t p_index, double p_value);
171171
MC_DLLEXPORT bool MCBrowserListSetUTF8String(MCBrowserListRef p_list, uint32_t p_index, const char *p_value);
172172
MC_DLLEXPORT bool MCBrowserListSetList(MCBrowserListRef p_list, uint32_t p_index, MCBrowserListRef p_value);
173173

174174
MC_DLLEXPORT bool MCBrowserListAppendBoolean(MCBrowserListRef p_list, bool p_value);
175175
MC_DLLEXPORT bool MCBrowserListAppendInteger(MCBrowserListRef p_list, int32_t p_value);
176-
MC_DLLEXPORT bool MCBrowserListAppendDouble(MCBrowserListRef p_list, double_t p_value);
176+
MC_DLLEXPORT bool MCBrowserListAppendDouble(MCBrowserListRef p_list, double p_value);
177177
MC_DLLEXPORT bool MCBrowserListAppendUTF8String(MCBrowserListRef p_list, const char *p_value);
178178
MC_DLLEXPORT bool MCBrowserListAppendList(MCBrowserListRef p_list, MCBrowserListRef p_value);
179179

180180
MC_DLLEXPORT bool MCBrowserListGetBoolean(MCBrowserListRef p_list, uint32_t p_index, bool &r_value);
181181
MC_DLLEXPORT bool MCBrowserListGetInteger(MCBrowserListRef p_list, uint32_t p_index, int32_t &r_value);
182-
MC_DLLEXPORT bool MCBrowserListGetDouble(MCBrowserListRef p_list, uint32_t p_index, double_t &r_value);
182+
MC_DLLEXPORT bool MCBrowserListGetDouble(MCBrowserListRef p_list, uint32_t p_index, double &r_value);
183183
MC_DLLEXPORT bool MCBrowserListGetUTF8String(MCBrowserListRef p_list, uint32_t p_index, char *&r_value);
184184
MC_DLLEXPORT bool MCBrowserListGetList(MCBrowserListRef p_list, uint32_t p_index, MCBrowserListRef &r_value);
185185

libbrowser/src/libbrowser_value.cpp

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ struct MCBrowserValue
2828
{
2929
bool boolean;
3030
int32_t integer;
31-
double_t double_val;
31+
double double_val;
3232
char *utf8_string;
3333
MCBrowserListRef array;
3434
};
@@ -89,7 +89,7 @@ bool MCBrowserValueGetInteger(MCBrowserValue &self, int32_t &r_value)
8989
return true;
9090
}
9191

92-
bool MCBrowserValueSetDouble(MCBrowserValue &self, double_t p_value)
92+
bool MCBrowserValueSetDouble(MCBrowserValue &self, double p_value)
9393
{
9494
MCBrowserValueClear(self);
9595
self.type = kMCBrowserValueTypeDouble;
@@ -98,7 +98,7 @@ bool MCBrowserValueSetDouble(MCBrowserValue &self, double_t p_value)
9898
return true;
9999
}
100100

101-
bool MCBrowserValueGetDouble(MCBrowserValue &self, double_t &r_value)
101+
bool MCBrowserValueGetDouble(MCBrowserValue &self, double &r_value)
102102
{
103103
if (self.type != kMCBrowserValueTypeDouble)
104104
return false;
@@ -138,6 +138,8 @@ bool MCBrowserValueSetList(MCBrowserValue &self, MCBrowserListRef p_value)
138138
MCBrowserValueClear(self);
139139
self.type = kMCBrowserValueTypeList;
140140
self.array = t_array;
141+
142+
return true;
141143
}
142144

143145
bool MCBrowserValueGetList(MCBrowserValue &self, MCBrowserListRef &r_value)
@@ -221,15 +223,15 @@ class MCBrowserList : public MCBrowserRefCounted
221223
return MCBrowserValueGetInteger(m_elements[p_index], r_value);
222224
}
223225

224-
bool SetDouble(uint32_t p_index, double_t p_value)
226+
bool SetDouble(uint32_t p_index, double p_value)
225227
{
226228
if (p_index >= m_size)
227229
return false;
228230

229231
return MCBrowserValueSetDouble(m_elements[p_index], p_value);
230232
}
231233

232-
bool GetDouble(uint32_t p_index, double_t &r_value)
234+
bool GetDouble(uint32_t p_index, double &r_value)
233235
{
234236
if (p_index >= m_size)
235237
return false;
@@ -285,7 +287,7 @@ class MCBrowserList : public MCBrowserRefCounted
285287
return Expand(m_size + 1) && SetInteger(t_index, p_value);
286288
}
287289

288-
bool AppendDouble(double_t p_value)
290+
bool AppendDouble(double p_value)
289291
{
290292
uint32_t t_index;
291293
t_index = m_size;
@@ -380,7 +382,7 @@ bool MCBrowserListSetInteger(MCBrowserListRef p_list, uint32_t p_index, int32_t
380382
return ((MCBrowserList*)p_list)->SetInteger(p_index, p_value);
381383
}
382384

383-
bool MCBrowserListSetDouble(MCBrowserListRef p_list, uint32_t p_index, double_t p_value)
385+
bool MCBrowserListSetDouble(MCBrowserListRef p_list, uint32_t p_index, double p_value)
384386
{
385387
if (p_list == nil)
386388
return false;
@@ -420,7 +422,7 @@ bool MCBrowserListAppendInteger(MCBrowserListRef p_list, int32_t p_value)
420422
return ((MCBrowserList*)p_list)->AppendInteger(p_value);
421423
}
422424

423-
bool MCBrowserListAppendDouble(MCBrowserListRef p_list, double_t p_value)
425+
bool MCBrowserListAppendDouble(MCBrowserListRef p_list, double p_value)
424426
{
425427
if (p_list == nil)
426428
return false;
@@ -460,7 +462,7 @@ bool MCBrowserListGetInteger(MCBrowserListRef p_list, uint32_t p_index, int32_t
460462
return ((MCBrowserList*)p_list)->GetInteger(p_index, r_value);
461463
}
462464

463-
bool MCBrowserListGetDouble(MCBrowserListRef p_list, uint32_t p_index, double_t &r_value)
465+
bool MCBrowserListGetDouble(MCBrowserListRef p_list, uint32_t p_index, double &r_value)
464466
{
465467
if (p_list == nil)
466468
return false;

0 commit comments

Comments
 (0)